@cgboiler/biz-mobile 1.18.8 → 1.18.10

package/lib/org-picker/index.less

@@ -1,181 +1,230 @@
-:root:root {
-  --van-action-sheet-max-height: 100%;
-}
-.org-list {
-  height: 85vh;
-  display: flex;
-  flex-direction: column;
-  
-  .highlight {
-    color: var(--van-primary-color);
-    font-weight: bold;
-  }
-
-  .breadcrumb-nav {
-    margin-bottom: 4px;
-    padding: 2px 16px;
-    border-radius: 4px;
-    font-size: 12px;
-
-    .dept-name {
-      &.current-dept {
-        color: #969799; /* 提示文字颜色 */
-      }
-    }
-
-    .separator {
-      color: #969799;
-      margin: 0 4px;
-    }
-  }
-
-  .search-bar {
-    position: sticky;
-    top: 0;
-    z-index: 1;
-  }
-
-  .org-selected-items {
-    display: flex;
-    flex-wrap: nowrap;
-    padding: 12px 16px;
-    gap: 12px;
-    background-color: #fff;
-    overflow-x: auto;
-    height: 68px;
-    border-bottom: 1px solid #eee;
-
-    .selected-tag {
-      flex-shrink: 0;
-      background: none;
-      border: none;
-      padding: 0;
-      margin: 0;
-      position: relative;
-      .close-icon {
-        position: absolute;
-        top: 0;
-        right: 0;
-        z-index: 1;
-        background-color: #fff;
-        border-radius: 50%;
-        border: 1px solid #eee;
-        width: 10px;
-        height: 10px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        font-size: 6px;
-        color: #969799;
-      }
-
-      .tag-avatar {
-        width: 40px;
-        height: 40px;
-        img {
-          border-radius: 4px;
-          border: 1px solid #eee;
-          object-fit: contain;
-        }
-      }
-    }
-  }
-
-  .bottom-section {
-    border-top: 1px solid #eee;
-    background-color: #fff;
-  }
-
-  .van-list {
-    flex: 1;
-    overflow-y: auto;
-    padding: 0 16px;
-  }
-
-  .org-content-wrap {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
-    position: relative;
-    padding-top: 4px;
-  }
-
-  .feed-list-wrap {
-    flex: 1;
-    display: flex;
-    overflow: hidden;
-    position: relative;
-    justify-content: center;
-  }
-  .search-result-list {
-    position: absolute;
-    top: 0; /* Adjust based on search bar and breadcrumb height */
-    left: 0;
-    right: 0;
-    bottom: 0; /* Adjust based on bottom section height if multiple is true */
-    z-index: 1;
-    background-color: #fff; /* Ensure background is white */
-    overflow-y: auto;
-    padding: 0 16px;
-  }
-
-  .org-item {
-    padding: 12px 0;
-    border-bottom: 1px solid #eee;
-    cursor: pointer;
-    display: flex;
-    align-items: center;
-    gap: 12px;
-
-    .org-item-select-icon {
-      display: none;
-      padding-left: 4px;
-    }
-    &.selected {
-      color: var(--van-primary-color);
-      .org-item-select-icon {
-        display: inline;
-      }
-    }
-
-    .org-avatar {
-      flex-shrink: 0;
-      width: 40px;
-      height: 40px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      img {
-        border-radius: 4px;
-        border: 1px solid #eee;
-        object-fit: contain;
-      }
-    }
-
-    .org-name {
-      font-size: 14px;
-      flex: 1;
-    }
-
-    &:last-child {
-      border-bottom: none;
-    }
-  }
-
-  .action-buttons {
-    padding: 16px;
-    display: flex;
-    justify-content: center;
-
-    .confirm-button {
-      background-color: var(--van-primary-color);
-      color: white;
-      padding: 10px 0;
-      border-radius: 4px;
-      text-align: center;
-      width: 100%;
-      font-size: 14px;
-    }
-  }
-}
+:root:root {
+  --van-action-sheet-max-height: 100%;
+}
+.org-list {
+  height: 85vh;
+  display: flex;
+  flex-direction: column;
+
+  .highlight {
+    color: var(--van-primary-color);
+    font-weight: bold;
+  }
+
+  .breadcrumb-nav {
+    margin-bottom: 4px;
+    padding: 2px 16px;
+    border-radius: 4px;
+    font-size: 12px;
+
+    .dept-name {
+      &.current-dept {
+        color: #969799; /* 提示文字颜色 */
+      }
+    }
+
+    .separator {
+      color: #969799;
+      margin: 0 4px;
+    }
+  }
+
+  .search-bar {
+    position: sticky;
+    top: 0;
+    z-index: 1;
+  }
+
+  .org-selected-items {
+    display: flex;
+    flex-wrap: nowrap;
+    padding: 12px 16px;
+    gap: 12px;
+    background-color: #fff;
+    overflow-x: auto;
+    height: 68px;
+    border-bottom: 1px solid #eee;
+
+    .selected-tag {
+      flex-shrink: 0;
+      background: none;
+      border: none;
+      padding: 0;
+      margin: 0;
+      position: relative;
+      .close-icon {
+        position: absolute;
+        top: 0;
+        right: 0;
+        z-index: 1;
+        background-color: #fff;
+        border-radius: 50%;
+        border: 1px solid #eee;
+        width: 10px;
+        height: 10px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 6px;
+        color: #969799;
+      }
+
+      .tag-avatar {
+        width: 40px;
+        height: 40px;
+        img {
+          border-radius: 4px;
+          border: 1px solid #eee;
+          object-fit: contain;
+        }
+      }
+    }
+  }
+
+  .bottom-section {
+    border-top: 1px solid #eee;
+    background-color: #fff;
+  }
+
+  .van-list {
+    flex: 1;
+    overflow-y: auto;
+    padding: 0 16px;
+  }
+
+  .org-content-wrap {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+    position: relative;
+    padding-top: 4px;
+  }
+
+  .feed-list-wrap {
+    flex: 1;
+    display: flex;
+    overflow: hidden;
+    position: relative;
+    justify-content: center;
+  }
+  .search-result-list {
+    position: absolute;
+    top: 0; /* Adjust based on search bar and breadcrumb height */
+    left: 0;
+    right: 0;
+    bottom: 0; /* Adjust based on bottom section height if multiple is true */
+    z-index: 1;
+    background-color: #fff; /* Ensure background is white */
+    overflow-y: auto;
+    padding: 0 16px;
+  }
+
+  .org-item {
+    padding: 12px 0;
+    border-bottom: 1px solid #eee;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    gap: 12px;
+
+    .org-item-select-icon {
+      display: none;
+      padding-left: 4px;
+    }
+    &.selected {
+      color: var(--van-primary-color);
+      .org-item-select-icon {
+        display: inline;
+      }
+    }
+
+    // 部门选择器样式
+    .dept-selector {
+      width: 20px;
+      height: 20px;
+      border: 2px solid #ddd;
+      border-radius: 4px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex-shrink: 0;
+
+      .dept-check-icon {
+        font-size: 12px;
+        color: var(--van-primary-color);
+        font-weight: bold;
+      }
+    }
+
+    // 部门完全选中状态
+    &.dept-fully-selected {
+      .dept-selector {
+        background-color: var(--van-primary-color);
+        border-color: var(--van-primary-color);
+
+        .dept-check-icon {
+          color: white;
+        }
+      }
+    }
+
+    // 部门部分选中状态
+    &.dept-partially-selected {
+      .dept-selector {
+        border-color: var(--van-primary-color);
+
+        .dept-check-icon {
+          color: var(--van-primary-color);
+        }
+      }
+    }
+
+    .org-avatar {
+      flex-shrink: 0;
+      width: 40px;
+      height: 40px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      img {
+        border-radius: 4px;
+        border: 1px solid #eee;
+        object-fit: contain;
+      }
+    }
+
+    .dept-content {
+      display: flex;
+      align-items: center;
+      flex: 1;
+      cursor: pointer;
+      gap: 12px;
+    }
+
+    .org-name {
+      font-size: 14px;
+      flex: 1;
+    }
+
+    &:last-child {
+      border-bottom: none;
+    }
+  }
+
+  .action-buttons {
+    padding: 16px;
+    display: flex;
+    justify-content: center;
+
+    .confirm-button {
+      background-color: var(--van-primary-color);
+      color: white;
+      padding: 10px 0;
+      border-radius: 4px;
+      text-align: center;
+      width: 100%;
+      font-size: 14px;
+    }
+  }
+}

package/lib/org-picker/useApi.d.ts

@@ -56,4 +56,7 @@ export declare const useApi: () => {
     getRecentSelectedUsers: () => Promise<RecentSelection[]>;
     setRecentSelectedUsers: (users: OrgItem[]) => Promise<void>;
     getUserInfoById: (id: string | number) => OrgItem | undefined;
+    deptList: import("vue").Ref<any[], any[]>;
+    getUsersByDeptId: (deptId: string) => OrgItem[];
+    getDeptById: (deptId: string) => any;
 };

package/lib/org-picker/useApi.js

@@ -42,6 +42,7 @@ __export(stdin_exports, {
 module.exports = __toCommonJS(stdin_exports);
 var import_vue = require("vue");
 var import_core = require("@cgboiler/core");
+var import_deptList = require("@cgboiler/core/src/utils/deptList");
 var import_lodash_es = require("lodash-es");
 const orgListCache = /* @__PURE__ */ new Map();
 const fetchData = (url, cacheKey) => __async(void 0, null, function* () {
@@ -55,7 +56,7 @@ const fetchData = (url, cacheKey) => __async(void 0, null, function* () {
   return res;
 });
 const fetchOrgList = (deptId) => __async(void 0, null, function* () {
-  const url = `https://wflow.hrbbrg.cn/v1/oa/org/tree/cloud?deptId=${deptId}&type=user`;
+  const url = `https://wflow.cgboiler.com/v1/oa/org/tree/cloud?deptId=${deptId}&type=user`;
   return fetchData(url, deptId || "");
 });
 const userList = (0, import_vue.ref)([]);
@@ -66,19 +67,31 @@ const userMap = (0, import_vue.computed)(() => {
   });
   return map;
 });
+const deptList = (0, import_vue.ref)([]);
+const deptMap = (0, import_vue.computed)(() => {
+  const map = /* @__PURE__ */ new Map();
+  deptList.value.forEach((item) => {
+    map.set(item.id, item);
+  });
+  return map;
+});
 function initUserList() {
   return __async(this, null, function* () {
     userList.value = yield (0, import_core.getUserList)();
   });
 }
+function initDeptList() {
+  return __async(this, null, function* () {
+    deptList.value = yield (0, import_deptList.getDeptList)();
+  });
+}
 initUserList();
+initDeptList();
 const useApi = () => {
   const orgList = (0, import_vue.ref)([]);
   const orgSearchList = (0, import_vue.ref)([]);
   const currentDeptId = (0, import_vue.ref)("1");
-  const deptPath = (0, import_vue.ref)([
-    { id: "1", name: "\u54C8\u5C14\u6EE8\u8F74\u627F\u96C6\u56E2\u6709\u9650\u516C\u53F8" }
-  ]);
+  const deptPath = (0, import_vue.ref)([{ id: "1", name: "\u5DDD\u9505\u516C\u53F8" }]);
   const dataId = (0, import_vue.ref)("");
   const userInfo = (0, import_vue.ref)({});
   const getOrgList = (deptId) => __async(void 0, null, function* () {
@@ -108,8 +121,11 @@ const useApi = () => {
       orgSearchList.value = [];
       return;
     }
-    const url = `https://wflow.hrbbrg.cn/v1/oa/org/tree/user/search/cloud?userName=${userName}`;
-    orgSearchList.value = yield fetchData(url);
+    const url = `https://wflow.cgboiler.com/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
+    );
   }), 300);
   const RECENT_SELECTED_USERS_KEY = "recent_selected_users_history";
   const MAX_RECENT_SELECTIONS = 15;
@@ -124,7 +140,7 @@ const useApi = () => {
       }
     });
     const url = decodeURIComponent(
-      `https://wflow.hrbbrg.cn/v1/wflow/process/form/wf687dda91e4b027b047d4654c/data?keywords=${name}_${user.userId}&pageNo=1&pageSize=20`
+      `https://wflow.cgboiler.com/v1/wflow/process/form/wf687dda91e4b027b047d4654c/data?keywords=${name}_${user.userId}&pageNo=1&pageSize=20`
     );
     const res = yield fetchData(url);
     let recentList = [];
@@ -161,10 +177,10 @@ const useApi = () => {
         data.field5375578403639 = JSON.stringify(list);
       }
       if (dataId.value) {
-        url = `https://wflow.hrbbrg.cn/v1/wflow/process/form/wf687dda91e4b027b047d4654c/data/${dataId.value}`;
+        url = `https://wflow.cgboiler.com/v1/wflow/process/form/wf687dda91e4b027b047d4654c/data/${dataId.value}`;
         method = "PUT";
       } else {
-        url = "https://wflow.hrbbrg.cn/v1/wflow/process/start/4e441786-65fa-11f0-aef7-ce938f4cd78d";
+        url = "https://wflow.cgboiler.com/v1/wflow/process/start/4e441786-65fa-11f0-aef7-ce938f4cd78d";
         method = "POST";
       }
       const token = user.token;
@@ -265,6 +281,22 @@ const useApi = () => {
   const getUserInfoById = (id) => {
     return userList.value.find((item) => item.id === id);
   };
+  const getUsersByDeptId = (deptId) => {
+    const users = [];
+    const directUsers = userList.value.filter(
+      (user) => user.deptId === deptId && user.status !== 5
+    );
+    users.push(...directUsers);
+    const childDepts = deptList.value.filter((dept) => dept.parentId === deptId);
+    childDepts.forEach((childDept) => {
+      const childUsers = getUsersByDeptId(childDept.id);
+      users.push(...childUsers);
+    });
+    return users;
+  };
+  const getDeptById = (deptId) => {
+    return deptMap.value.get(deptId);
+  };
   return {
     userList,
     orgList,
@@ -276,6 +308,9 @@ const useApi = () => {
     searchOrgList,
     getRecentSelectedUsers,
     setRecentSelectedUsers,
-    getUserInfoById
+    getUserInfoById,
+    deptList,
+    getUsersByDeptId,
+    getDeptById
   };
 };

package/lib/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/lib/project-select/useApi.js

@@ -45,9 +45,12 @@ var import_core = require("@cgboiler/core");
 const useApi = () => {
   const projectList = (0, import_vue.ref)([]);
   const getProjectList = () => __async(void 0, null, function* () {
-    const res = yield (0, import_core.useFetch)("https://wx.hrbbrg.cn/v1/note/projects", {
-      method: "GET"
-    });
+    const res = yield (0, import_core.useFetch)(
+      "https://vx.cgboiler.com/v1/note/projects",
+      {
+        method: "GET"
+      }
+    );
     if (res == null ? void 0 : res.d) {
       projectList.value = res.d.filter((item) => item.projectName).map((item) => {
         return {

package/lib/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";