@cgboiler/biz-mobile 1.17.14 → 1.17.16

package/lib/index.js

@@ -45,7 +45,7 @@ __reExport(stdin_exports, require("./md-preview"), module.exports);
 __reExport(stdin_exports, require("./org-picker"), module.exports);
 __reExport(stdin_exports, require("./project-select"), module.exports);
 __reExport(stdin_exports, require("./rich-text-editor"), module.exports);
-const version = "1.17.13";
+const version = "1.17.15";
 function install(app) {
   const components = [
     import_md_preview.default,

package/lib/md-preview/index.less

@@ -1,101 +1,101 @@
-.katex-block {
-  display: block;
-  margin: 1em 0;
-  text-align: center;
-  overflow-x: auto;
-  overflow-y: hidden;
-}
-
-.cgx-markdown-preview {
-
-  /* 差异对比样式 */
-  .diff-container {
-    border: 1px solid #ebeef5;
-    border-radius: 4px;
-    overflow: auto;
-  }
-
-  .diff-equal {
-    color: #606266;
-  }
-
-  .diff-delete {
-    background-color: #ffeef0;
-    color: #f56c6c;
-    text-decoration: line-through;
-  }
-
-  .diff-insert {
-    background-color: #e6ffec;
-    color: #67c23a;
-  }
-
-  .diff-unified-view pre {
-    margin: 0;
-    padding: 8px;
-    white-space: pre-wrap;
-    word-break: break-word;
-  }
-}
-
-.cgx-markdown-preview {
-  line-height: 1.6;
-  font-size: var(--font-base, 16px);
-  ol {
-    list-style: auto;
-  }
-
-  ul {
-    list-style: disc;
-  }
-
-  ol,
-  ul {
-    padding-left: 1.5em;
-    margin: 0 0 12px 0;
-  }
-
-  li::marker {
-    text-align: start !important;
-  }
-
-  h1 {
-    font-size: 2em;
-    font-weight: bold;
-    margin: 16px 0;
-  }
-
-  h2 {
-    font-size: 1.5em;
-    font-weight: bold;
-    margin: 14px 0;
-  }
-
-  p {
-    margin: 12px 0;
-  }
-
-  blockquote {
-    margin: 0;
-    padding-left: 1em;
-    border-left: 4px solid #ddd;
-    color: #666;
-  }
-
-  table {
-    border-collapse: collapse;
-    width: 100%;
-    margin-bottom: 16px;
-  }
-
-  th,
-  td {
-    border: 1px solid #ddd;
-    padding: 8px;
-    text-align: left;
-  }
-
-  th {
-    background-color: #f6f8fa;
-  }
-}
+.katex-block {
+  display: block;
+  margin: 1em 0;
+  text-align: center;
+  overflow-x: auto;
+  overflow-y: hidden;
+}
+
+.cgx-markdown-preview {
+
+  /* 差异对比样式 */
+  .diff-container {
+    border: 1px solid #ebeef5;
+    border-radius: 4px;
+    overflow: auto;
+  }
+
+  .diff-equal {
+    color: #606266;
+  }
+
+  .diff-delete {
+    background-color: #ffeef0;
+    color: #f56c6c;
+    text-decoration: line-through;
+  }
+
+  .diff-insert {
+    background-color: #e6ffec;
+    color: #67c23a;
+  }
+
+  .diff-unified-view pre {
+    margin: 0;
+    padding: 8px;
+    white-space: pre-wrap;
+    word-break: break-word;
+  }
+}
+
+.cgx-markdown-preview {
+  line-height: 1.6;
+  font-size: var(--font-base, 16px);
+  ol {
+    list-style: auto;
+  }
+
+  ul {
+    list-style: disc;
+  }
+
+  ol,
+  ul {
+    padding-left: 1.5em;
+    margin: 0 0 12px 0;
+  }
+
+  li::marker {
+    text-align: start !important;
+  }
+
+  h1 {
+    font-size: 2em;
+    font-weight: bold;
+    margin: 16px 0;
+  }
+
+  h2 {
+    font-size: 1.5em;
+    font-weight: bold;
+    margin: 14px 0;
+  }
+
+  p {
+    margin: 12px 0;
+  }
+
+  blockquote {
+    margin: 0;
+    padding-left: 1em;
+    border-left: 4px solid #ddd;
+    color: #666;
+  }
+
+  table {
+    border-collapse: collapse;
+    width: 100%;
+    margin-bottom: 16px;
+  }
+
+  th,
+  td {
+    border: 1px solid #ddd;
+    padding: 8px;
+    text-align: left;
+  }
+
+  th {
+    background-color: #f6f8fa;
+  }
+}

package/lib/org-picker/OrgPicker.js

@@ -51,7 +51,8 @@ var stdin_default = (0, import_vue2.defineComponent)({
       getOrgList,
       orgList,
       deptPath,
-      userList
+      userList,
+      getUserInfoById
     } = api;
     getOrgList();
     const activeTab = (0, import_vue2.ref)("txl");
@@ -171,7 +172,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
         "class": "py-8px border-b border-[#eee] flex items-center"
       }, [(0, import_vue.createVNode)("span", {
         "class": "flex-1"
-      }, [historyItem.selectedUsers.map((user) => highlightText(user.name, keyword.value)).reduce((prev, curr) => [prev, "\uFF0C", curr])]), (0, import_vue.createVNode)("span", {
+      }, [historyItem.selectedUsers.map((user) => highlightText(getUserInfoById(user.id), keyword.value)).reduce((prev, curr) => [prev, "\uFF0C", curr])]), (0, import_vue.createVNode)("span", {
         "class": "p-4px pl-2",
         "onClick": (e) => {
           e.stopPropagation();

package/lib/org-picker/index.less

@@ -1,181 +1,181 @@
-: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;
+      }
+    }
+
+    .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;
+    }
+  }
+}

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

@@ -55,4 +55,5 @@ export declare const useApi: () => {
     searchOrgList: import("lodash-es").DebouncedFunc<(userName: string) => Promise<void>>;
     getRecentSelectedUsers: () => Promise<RecentSelection[]>;
     setRecentSelectedUsers: (users: OrgItem[]) => Promise<void>;
+    getUserInfoById: (id: string | number) => string;
 };

package/lib/org-picker/useApi.js

@@ -116,20 +116,9 @@ const useApi = () => {
     if (res.records && res.records.length) {
       res.records.forEach((item) => {
         const data = JSON.parse(item.data);
-        console.log(data.field6713678545899);
         if (data.field6713678545899 === userInfo.value.name + "_" + user.userId) {
           dataId.value = item.id;
           const list = data.field5375578403639 ? JSON.parse(data.field5375578403639) : [];
-          if (Array.isArray(list)) {
-            list.forEach((item2) => {
-              if (item2.selectedUsers && Array.isArray(item2.selectedUsers)) {
-                item2.selectedUsers = item2.selectedUsers.map((user2) => {
-                  const fullUser = userList.value.find((u) => u.id === user2.id);
-                  return fullUser || { id: user2.id };
-                });
-              }
-            });
-          }
           recentList = list;
         }
       });
@@ -142,26 +131,20 @@ const useApi = () => {
       let url = "";
       let method = "";
       data.field6713678545899 = userInfo.value.name + "_" + user.userId;
-      if (data.field5375578403639) {
-        const list = JSON.parse(data.field5375578403639);
-        if (data.field5375578403639) {
-          if (Array.isArray(list)) {
-            list.forEach((item) => {
-              if (item.selectedUsers && Array.isArray(item.selectedUsers)) {
-                item.selectedUsers = item.selectedUsers.map((user2) => ({
-                  id: user2.id
-                }));
-              }
-            });
-            data.field5375578403639 = JSON.stringify(list);
-          }
-        }
-      }
       let requestData = {
         deptId: userInfo.value.deptId,
         formData: data,
         processUsers: {}
       };
+      if (data.field5375578403639) {
+        const list = JSON.parse(data.field5375578403639);
+        list.forEach((item) => {
+          if (item.selectedUsers) {
+            item.selectedUsers = item.selectedUsers.map((user2) => ({ id: user2.id }));
+          }
+        });
+        data.field5375578403639 = JSON.stringify(list);
+      }
       if (dataId.value) {
         url = `https://wflow.cgboiler.com/v1/wflow/process/form/wf687dda91e4b027b047d4654c/data/${dataId.value}`;
         method = "PUT";
@@ -264,6 +247,15 @@ const useApi = () => {
       console.error("Failed to delete recent selected users history to localStorage", error);
     }
   });
+  const getUserInfoById = (id) => {
+    let name = "";
+    userList.value.forEach((item) => {
+      if (item.id === id) {
+        name = item.name;
+      }
+    });
+    return name;
+  };
   return {
     userList,
     orgList,
@@ -274,6 +266,7 @@ const useApi = () => {
     deleteRecentSelectedUsers,
     searchOrgList,
     getRecentSelectedUsers,
-    setRecentSelectedUsers
+    setRecentSelectedUsers,
+    getUserInfoById
   };
 };

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

@@ -7,5 +7,5 @@ export declare function useSearch(props: any, api: any): {
     filteredOrgList: import("vue").ComputedRef<any>;
     recentSelectedHistory: import("vue").Ref<any[], any[]>;
     filterRecentSelectedHistory: import("vue").Ref<any[], any[]>;
-    highlightText: (text: string, keyword: string) => string | (string | import("vue/jsx-runtime").JSX.Element)[];
+    highlightText: (text: string | number, keyword: string) => string | number | (string | import("vue/jsx-runtime").JSX.Element)[];
 };