@cgboiler/biz-mobile 1.18.20 → 1.18.22

package/es/org-picker/useApi.js

@@ -1,3 +1,22 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -22,22 +41,15 @@ import { computed, ref } from "vue";
 import { useFetch, getUserList, getUserInfo } from "@cgboiler/core";
 import { getDeptList } from "@cgboiler/core";
 import { debounce } from "lodash-es";
-const orgListCache = /* @__PURE__ */ new Map();
-const fetchData = (url, cacheKey) => __async(void 0, null, function* () {
-  if (cacheKey && orgListCache.has(cacheKey)) {
-    return orgListCache.get(cacheKey);
-  }
-  const res = (yield useFetch(url, { method: "GET" })) || [];
-  if (cacheKey) {
-    orgListCache.set(cacheKey, res);
-  }
-  return res;
-});
-const fetchOrgList = (deptId) => __async(void 0, null, function* () {
-  const url = `${window.globalConfig.wFlowApi}/v1/oa/org/tree/cloud?deptId=${deptId}&type=user`;
-  return fetchData(url, deptId || "");
-});
+const COMPANY_CHUANGUO = "fbd9654e-4d19-4d28-b525-e7477a8b28b9";
+const COMPANY_HAZHOU = "23a8cb4b-6b5b-11f0-8f6e-cacc862768d8";
+const COMPANIES = [
+  { id: COMPANY_CHUANGUO, name: "\u5DDD\u9505\u516C\u53F8" },
+  { id: COMPANY_HAZHOU, name: "\u54C8\u8F74\u516C\u53F8" }
+];
 const userList = ref([]);
+const deptList = ref([]);
+const isInitialized = ref(false);
 const userMap = computed(() => {
   const map = /* @__PURE__ */ new Map();
   userList.value.forEach((item) => {
@@ -45,7 +57,6 @@ const userMap = computed(() => {
   });
   return map;
 });
-const deptList = ref([]);
 const deptMap = computed(() => {
   const map = /* @__PURE__ */ new Map();
   deptList.value.forEach((item) => {
@@ -53,77 +64,217 @@ const deptMap = computed(() => {
   });
   return map;
 });
-function initUserList() {
-  return __async(this, null, function* () {
-    userList.value = yield getUserList();
-  });
-}
-function initDeptList() {
+let initPromise = null;
+const fetchAllCompaniesData = () => __async(void 0, null, function* () {
+  const companyIds = [COMPANY_CHUANGUO, COMPANY_HAZHOU];
+  console.log("Fetching Org Data for companies in parallel:", companyIds);
+  const results = yield Promise.all(
+    companyIds.map((cid) => __async(void 0, null, function* () {
+      try {
+        const [users, depts] = yield Promise.all([getUserList(cid), getDeptList(cid)]);
+        const processedUsers = (users || []).map((u) => __spreadProps(__spreadValues({}, u), {
+          companyId: u.companyId || cid,
+          type: "user"
+        }));
+        const processedDepts = (depts || []).map((d) => __spreadProps(__spreadValues({}, d), {
+          companyId: d.companyId || cid,
+          type: "dept"
+        }));
+        return { users: processedUsers, depts: processedDepts };
+      } catch (e) {
+        console.error(`Failed to fetch data for company ${cid}`, e);
+        return { users: [], depts: [] };
+      }
+    }))
+  );
+  const allUsers = results.flatMap((r) => r.users);
+  const allDepts = results.flatMap((r) => r.depts);
+  return { users: allUsers, depts: allDepts };
+});
+function initData() {
   return __async(this, null, function* () {
-    deptList.value = yield getDeptList();
+    if (isInitialized.value)
+      return;
+    if (initPromise)
+      return initPromise;
+    initPromise = (() => __async(this, null, function* () {
+      try {
+        const { users, depts } = yield fetchAllCompaniesData();
+        userList.value = users;
+        deptList.value = depts;
+        isInitialized.value = true;
+        console.log("Org Data Initialized. Users:", users.length, "Depts:", depts.length);
+      } catch (e) {
+        console.error("Failed to init org data", e);
+      } finally {
+        initPromise = null;
+      }
+    }))();
+    return initPromise;
   });
 }
-initUserList();
-initDeptList();
 function getFinalUserList() {
   return __async(this, null, function* () {
-    var _a;
-    if ((_a = userList.value) == null ? void 0 : _a.length) {
-      return userList.value;
+    if (!isInitialized.value) {
+      yield initData();
     }
-    return yield getUserList();
+    return userList.value;
   });
 }
+const fetchData = (url) => __async(void 0, null, function* () {
+  const res = (yield useFetch(url, { method: "GET" })) || [];
+  return res;
+});
 const useApi = () => {
   const orgList = ref([]);
   const orgSearchList = ref([]);
-  const currentDeptId = ref("1");
-  const deptPath = ref([{ id: "1", name: "\u4F01\u4E1A\u901A\u8BAF\u5F55" }]);
+  const currentDeptId = ref("");
+  const browsedCompanyId = ref("");
+  const deptPath = ref([{ id: "", name: "\u4F01\u4E1A\u901A\u8BAF\u5F55" }]);
   const dataId = ref("");
   const userInfo = ref({});
   const getOrgList = (deptId) => __async(void 0, null, function* () {
+    if (!isInitialized.value && !initPromise) {
+      initData();
+    }
+    if (deptId && !isInitialized.value) {
+      yield initData();
+    }
     if (deptId) {
       currentDeptId.value = deptId;
       const index = deptPath.value.findIndex((dept) => dept.id === deptId);
       if (index > -1) {
         deptPath.value = deptPath.value.slice(0, index + 1);
+        if (deptId === "") {
+          browsedCompanyId.value = "";
+        } else {
+          const firstPathItem = deptPath.value[1];
+          if (firstPathItem && COMPANIES.some((c) => c.id === String(firstPathItem.id))) {
+            browsedCompanyId.value = String(firstPathItem.id);
+          }
+        }
       } else {
-        const currentDept = orgList.value.find((item) => item.id === deptId && item.type === "dept");
-        if (currentDept) {
-          deptPath.value.push({ id: currentDept.id, name: currentDept.name });
+        const company = COMPANIES.find((c) => c.id === deptId);
+        if (company) {
+          deptPath.value.push({ id: company.id, name: company.name });
+          browsedCompanyId.value = company.id;
+        } else {
+          const currentDept = deptList.value.find(
+            (item) => item.id === deptId && (!browsedCompanyId.value || item.companyId === browsedCompanyId.value)
+          );
+          if (currentDept) {
+            deptPath.value.push({
+              id: currentDept.id,
+              name: currentDept.deptName || currentDept.name
+            });
+            if (!browsedCompanyId.value)
+              browsedCompanyId.value = currentDept.companyId;
+          }
         }
       }
+    } else {
+      currentDeptId.value = "";
+      browsedCompanyId.value = "";
+      deptPath.value = [{ id: "", name: "\u4F01\u4E1A\u901A\u8BAF\u5F55" }];
     }
-    const list = yield fetchOrgList(currentDeptId.value);
-    orgList.value = list.filter((item) => {
-      var _a;
-      if (item.type === "user") {
-        return ((_a = userMap.value.get(item.id)) == null ? void 0 : _a.status) !== 5;
+    if (!currentDeptId.value) {
+      orgList.value = COMPANIES.map(
+        (c) => ({
+          id: c.id,
+          name: c.name,
+          type: "dept",
+          avatar: "",
+          status: 1
+        })
+      );
+    } else {
+      if (!isInitialized.value) {
+        yield initData();
+      }
+      const isCompany = COMPANIES.some((c) => c.id === currentDeptId.value);
+      let targetDepts = [];
+      let targetUsers = [];
+      if (isCompany) {
+        const companyRootDepts = deptList.value.filter(
+          (d) => d.companyId === currentDeptId.value && (d.parentId === "0" || !d.parentId)
+        );
+        if (companyRootDepts.length === 1) {
+          const rootDept = companyRootDepts[0];
+          targetDepts = deptList.value.filter(
+            (d) => d.parentId === rootDept.id && d.companyId === currentDeptId.value
+          );
+          targetUsers = userList.value.filter(
+            (u) => u.deptId === rootDept.id && u.companyId === currentDeptId.value && u.status !== 5
+          );
+        } else {
+          targetDepts = companyRootDepts;
+          targetUsers = userList.value.filter(
+            (u) => u.companyId === currentDeptId.value && (u.deptId === "0" || !u.deptId) && u.status !== 5
+          );
+        }
+      } else {
+        const currentDeptObj = deptList.value.find(
+          (d) => d.id === currentDeptId.value && (!browsedCompanyId.value || d.companyId === browsedCompanyId.value)
+        );
+        const activeCompanyId = currentDeptObj ? currentDeptObj.companyId : browsedCompanyId.value;
+        targetDepts = deptList.value.filter(
+          (d) => d.parentId === currentDeptId.value && d.companyId === activeCompanyId
+        );
+        targetUsers = userList.value.filter(
+          (u) => u.deptId === currentDeptId.value && u.status !== 5 && u.companyId === activeCompanyId
+        );
       }
-      return true;
-    }) || [];
+      const depts = targetDepts.map(
+        (d) => __spreadProps(__spreadValues({}, d), {
+          id: d.id,
+          name: d.deptName || d.name,
+          type: "dept",
+          avatar: "",
+          status: 1
+        })
+      );
+      const users = targetUsers.map(
+        (u) => __spreadProps(__spreadValues({}, u), {
+          type: "user"
+        })
+      );
+      orgList.value = [...users, ...depts];
+    }
   });
   const searchOrgList = debounce((userName) => __async(void 0, null, function* () {
     if (!userName) {
       orgSearchList.value = [];
       return;
     }
-    const url = `${window.globalConfig.wFlowApi}/v1/oa/org/tree/user/search/cloud?userName=${userName}`;
-    const searchResults = yield fetchData(url);
-    orgSearchList.value = searchResults.filter((item) => item.type !== "user" || item.status !== 5).filter((item, index, self) => index === self.findIndex((other) => other.id === item.id));
+    if (!isInitialized.value) {
+      yield initData();
+    }
+    const lowerName = userName.toLowerCase();
+    const results = userList.value.filter((u) => {
+      if (u.status === 5)
+        return false;
+      const nameMatch = u.name && u.name.toLowerCase().includes(lowerName);
+      const pyMatch = u.py && u.py.toLowerCase().includes(lowerName);
+      const pinyinMatch = u.pinyin && u.pinyin.toLowerCase().includes(lowerName);
+      return nameMatch || pyMatch || pinyinMatch;
+    });
+    orgSearchList.value = results.filter(
+      (item, index, self) => index === self.findIndex((other) => other.id === item.id)
+    );
   }), 300);
   const MAX_RECENT_SELECTIONS = 20;
   const getRecentUsers = () => __async(void 0, null, function* () {
     var _a;
     const user = yield getUserInfo();
     let name = "";
-    userList.value = yield getUserList();
-    userList.value.forEach((item) => {
-      if (item.id === user.userId) {
-        name = item.name;
-        userInfo.value = item;
-      }
-    });
+    yield initData();
+    const foundUser = userList.value.find((item) => item.id === user.userId);
+    if (foundUser) {
+      name = foundUser.name;
+      userInfo.value = foundUser;
+    } else {
+      userInfo.value = user;
+    }
     const url = decodeURIComponent(
       `${window.globalConfig.wFlowApi}/v1/wflow/process/form/wf687dda91e4b027b047d4654c/data?keywords=${name}_${user.userId}&pageNo=1&pageSize=20`
     );
@@ -132,7 +283,8 @@ const useApi = () => {
     if ((_a = res == null ? void 0 : res.records) == null ? void 0 : _a.length) {
       res.records.forEach((item) => {
         const data = JSON.parse(item.data);
-        if (data.field6713678545899 === userInfo.value.name + "_" + user.userId) {
+        const currentName = userInfo.value.name || user.name || "";
+        if (data.field6713678545899 === currentName + "_" + user.userId) {
           dataId.value = item.id;
           const list = data.field5375578403639 ? JSON.parse(data.field5375578403639) : [];
           recentList = list;
@@ -155,9 +307,8 @@ const useApi = () => {
       if (data.field5375578403639) {
         const list = JSON.parse(data.field5375578403639);
         list.forEach((item) => {
-          if (item.selectedUsers) {
+          if (item.selectedUsers)
             item.selectedUsers = item.selectedUsers.map((user2) => ({ id: user2.id }));
-          }
         });
         data.field5375578403639 = JSON.stringify(list);
       }
@@ -171,15 +322,11 @@ const useApi = () => {
       const token = user.token;
       const response = yield fetch(url, {
         method,
-        headers: {
-          "Content-Type": "application/json",
-          token: token || ""
-        },
+        headers: { "Content-Type": "application/json", token: token || "" },
         body: JSON.stringify(requestData)
       });
-      if (!response.ok) {
+      if (!response.ok)
         throw new Error(`HTTP error! status: ${response.status}`);
-      }
       const responseText = yield response.text();
       let result;
       try {
@@ -189,9 +336,8 @@ const useApi = () => {
         const match = responseText.match(uuidRegex);
         if (match && match[1]) {
           const uuid = match[1];
-          if (!dataId.value) {
+          if (!dataId.value)
             dataId.value = uuid;
-          }
           result = { success: true, message: responseText, id: uuid };
         } else {
           result = { success: true, message: responseText };
@@ -221,7 +367,6 @@ const useApi = () => {
     const history = yield getRecentSelectedUsers();
     const newSelection = {
       id: Date.now().toString(),
-      // 使用时间戳作为唯一ID
       selectedUsers: users
     };
     const filteredHistory = history.filter((item) => {
@@ -261,13 +406,53 @@ const useApi = () => {
   const getUserInfoById = (id) => {
     return userList.value.find((item) => item.id === id);
   };
-  const getUsersByDeptId = (deptId) => {
+  const getUsersByDeptId = (deptId, cid, visited = /* @__PURE__ */ new Set()) => {
+    const effectiveCompanyId = cid || browsedCompanyId.value;
+    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);
+        children.forEach((child) => {
+          if (!visited.has(child.id)) {
+            visited.add(child.id);
+            result.push(...gatherUsers(child.id));
+          }
+        });
+        return result;
+      };
+      return gatherUsers(companyId);
+    }
     const users = [];
-    const directUsers = userList.value.filter((user) => user.deptId === deptId && user.status !== 5);
+    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);
+    const childDepts = deptList.value.filter(
+      (dept) => dept.parentId === deptId && (!effectiveCompanyId || dept.companyId === effectiveCompanyId)
+    );
     childDepts.forEach((childDept) => {
-      const childUsers = getUsersByDeptId(childDept.id);
+      const childUsers = getUsersByDeptId(childDept.id, effectiveCompanyId, visited);
       users.push(...childUsers);
     });
     return users;
@@ -275,12 +460,14 @@ const useApi = () => {
   const getDeptById = (deptId) => {
     return deptMap.value.get(deptId);
   };
+  const getCompanies = () => COMPANIES;
   return {
     userList,
     orgList,
     orgSearchList,
     getOrgList,
     currentDeptId,
+    browsedCompanyId,
     deptPath,
     deleteRecentSelectedUsers,
     searchOrgList,
@@ -289,7 +476,8 @@ const useApi = () => {
     getUserInfoById,
     deptList,
     getUsersByDeptId,
-    getDeptById
+    getDeptById,
+    getCompanies
   };
 };
 export {

package/es/org-picker/useSearch.js

@@ -20,15 +20,21 @@ var __async = (__this, __arguments, generator) => {
 };
 import { createVNode as _createVNode, Fragment as _Fragment, createTextVNode as _createTextVNode } from "vue";
 import "./_atomic.css";
-import { ref, computed, watch, watchEffect, nextTick } from "vue";
+import { ref, computed, watch, watchEffect, nextTick, onMounted } from "vue";
 import { Empty, Image } from "vant";
+import { getUserInfo } from "@cgboiler/core";
 const isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
+const COMPANY_MAP = {
+  "fbd9654e-4d19-4d28-b525-e7477a8b28b9": "\u5DDD\u9505",
+  "23a8cb4b-6b5b-11f0-8f6e-cacc862768d8": "\u54C8\u8F74"
+};
 function useSearch({
   props,
   api,
   isSearchFocus
 }) {
   const {
+    browsedCompanyId,
     orgSearchList,
     getOrgList,
     currentDeptId,
@@ -40,13 +46,22 @@ function useSearch({
   } = api;
   const keyword = ref("");
   const searchRef = ref();
+  const currentCompanyId = ref("");
   const recentSelectedHistory = ref([]);
   const filterRecentSelectedHistory = ref([]);
-  watchEffect(() => __async(this, null, function* () {
-    if (props.show && props.multiple && !recentSelectedHistory.value.length) {
+  onMounted(() => __async(this, null, function* () {
+    const info = yield getUserInfo();
+    currentCompanyId.value = info.companyId || "";
+  }));
+  const hasFetchedHistory = ref(false);
+  watch(() => [props.show, props.multiple], (_0) => __async(this, [_0], function* ([show, multiple]) {
+    if (show && multiple && !hasFetchedHistory.value) {
       recentSelectedHistory.value = yield getRecentSelectedUsers();
+      hasFetchedHistory.value = true;
     }
-  }));
+  }), {
+    immediate: true
+  });
   const setRecentUsers = (users) => __async(this, null, function* () {
     yield setRecentSelectedUsers(users);
     recentSelectedHistory.value = yield getRecentSelectedUsers();
@@ -103,21 +118,27 @@ function useSearch({
   }) => {
     return _createVNode("div", {
       "class": "absolute top-0 left-0 right-0 bottom-0 bg-[#fff] z-1 overflow-auto"
-    }, [filteredOrgList.value.length ? _createVNode(_Fragment, null, [" ", _createVNode("div", {
+    }, [filteredOrgList.value.length ? _createVNode(_Fragment, null, [_createVNode("div", {
       "class": "px-16px"
     }, [filteredOrgList.value.length === 0 ? _createVNode(Empty, {
       "description": "\u672A\u627E\u5230\u76F8\u5173\u4EBA\u5458"
-    }, null) : _createVNode(_Fragment, null, [filteredOrgList.value.map((item) => _createVNode("div", {
-      "class": ["org-item", isSelected(item) ? "selected" : ""],
-      "onClick": () => handleSelect(item)
-    }, [_createVNode(Image, {
-      "class": "org-avatar",
-      "src": item.avatar
-    }, null), _createVNode("div", {
-      "class": "org-name"
-    }, [item.name, _createVNode("span", {
-      "class": "org-item-select-icon"
-    }, [_createTextVNode("\u2713")])])]))])])]) : "", isSearchFocus.value && isMobile ? _createVNode("div", {
+    }, null) : _createVNode(_Fragment, null, [filteredOrgList.value.map((item) => {
+      const showCompany = browsedCompanyId.value && item.companyId && item.companyId !== browsedCompanyId.value;
+      const companyName = showCompany ? COMPANY_MAP[item.companyId] : "";
+      return _createVNode("div", {
+        "class": ["org-item", isSelected(item) ? "selected" : ""],
+        "onClick": () => handleSelect(item)
+      }, [_createVNode(Image, {
+        "class": "org-avatar",
+        "src": item.avatar
+      }, null), _createVNode("div", {
+        "class": "org-name"
+      }, [item.name, showCompany && companyName && _createVNode("span", {
+        "class": "text-gray-500 text-[12px] ml-1"
+      }, [_createTextVNode("@"), companyName]), _createVNode("span", {
+        "class": "org-item-select-icon"
+      }, [_createTextVNode("\u2713")])])]);
+    })])])]) : "", isSearchFocus.value && isMobile ? _createVNode("div", {
       "class": "h-[300px]"
     }, null) : ""]);
   };

package/es/project-select/index.less

@@ -1,45 +1,45 @@
-:root:root {
-  --van-action-sheet-max-height: 100%;
-}
-.project-list {
-  height: 85vh;
-  display: flex;
-  flex-direction: column;
-
-  .search-bar {
-    position: sticky;
-    top: 0;
-    z-index: 1;
-  }
-
-  .van-list {
-    flex: 1;
-    overflow-y: auto;
-    padding: 0 16px;
-  }
-
-  .project-item {
-    padding: 12px 0;
-    border-bottom: 1px solid #eee;
-    cursor: pointer;
-
-    &.selected {
-      color: var(--van-primary-color);
-    }
-
-    .project-name {
-      font-size: 14px;
-      
-      .highlight {
-        color: var(--van-primary-color);
-        font-weight: bold;
-        padding: 0 2px;
-        border-radius: 2px;
-      }
-    }
-
-    &:last-child {
-      border-bottom: none;
-    }
-  }
-}
+:root:root {
+  --van-action-sheet-max-height: 100%;
+}
+.project-list {
+  height: 85vh;
+  display: flex;
+  flex-direction: column;
+
+  .search-bar {
+    position: sticky;
+    top: 0;
+    z-index: 1;
+  }
+
+  .van-list {
+    flex: 1;
+    overflow-y: auto;
+    padding: 0 16px;
+  }
+
+  .project-item {
+    padding: 12px 0;
+    border-bottom: 1px solid #eee;
+    cursor: pointer;
+
+    &.selected {
+      color: var(--van-primary-color);
+    }
+
+    .project-name {
+      font-size: 14px;
+      
+      .highlight {
+        color: var(--van-primary-color);
+        font-weight: bold;
+        padding: 0 2px;
+        border-radius: 2px;
+      }
+    }
+
+    &:last-child {
+      border-bottom: none;
+    }
+  }
+}

package/es/vue-sfc-shim.d.ts

@@ -1,9 +1,9 @@
-declare module '*.vue' {
-  // eslint-disable-next-line
-  import { DefineComponent } from 'vue'
-  const Component: DefineComponent
-  export default Component
-}
-declare module "marked";
-declare module "katex";
+declare module '*.vue' {
+  // eslint-disable-next-line
+  import { DefineComponent } from 'vue'
+  const Component: DefineComponent
+  export default Component
+}
+declare module "marked";
+declare module "katex";
 declare module "diff-match-patch";