@cgboiler/biz-mobile 1.17.14 → 1.17.15

package/es/index.d.ts

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

package/es/index.js

@@ -2,7 +2,7 @@ import MdPreview from "./md-preview";
 import OrgPicker from "./org-picker";
 import ProjectSelect from "./project-select";
 import RichTextEditor from "./rich-text-editor";
-const version = "1.17.13";
+const version = "1.17.14";
 function install(app) {
   const components = [
     MdPreview,

package/es/org-picker/OrgPicker.js

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

package/es/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/es/org-picker/useApi.js

@@ -19,13 +19,7 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 import { ref } from "vue";
-import {
-  useFetch,
-  getUserList,
-  getStorage,
-  getUserInfo,
-  removeStorage
-} from "@cgboiler/core";
+import { useFetch, getUserList, getStorage, getUserInfo, removeStorage } from "@cgboiler/core";
 import { debounce } from "lodash-es";
 const orgListCache = /* @__PURE__ */ new Map();
 const fetchData = (url, cacheKey) => __async(void 0, null, function* () {
@@ -100,20 +94,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;
         }
       });
@@ -126,26 +109,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";
@@ -248,6 +225,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,
@@ -258,7 +244,8 @@ const useApi = () => {
     deleteRecentSelectedUsers,
     searchOrgList,
     getRecentSelectedUsers,
-    setRecentSelectedUsers
+    setRecentSelectedUsers,
+    getUserInfoById
   };
 };
 export {

package/es/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)[];
 };

package/es/org-picker/useSearch.js

@@ -30,7 +30,8 @@ function useSearch(props, api) {
     searchOrgList,
     setRecentSelectedUsers,
     deleteRecentSelectedUsers,
-    getRecentSelectedUsers
+    getRecentSelectedUsers,
+    getUserInfoById
   } = api;
   const keyword = ref("");
   const searchRef = ref();
@@ -49,7 +50,7 @@ function useSearch(props, api) {
   });
   watchEffect(() => {
     if (keyword.value) {
-      filterRecentSelectedHistory.value = recentSelectedHistory.value.filter((item) => item.selectedUsers.some((user) => keyword.value.split("").some((char) => user.name.includes(char))));
+      filterRecentSelectedHistory.value = recentSelectedHistory.value.filter((item) => item.selectedUsers.some((user) => keyword.value.split("").some((char) => getUserInfoById(user.id).includes(char))));
     } else {
       filterRecentSelectedHistory.value = recentSelectedHistory.value;
     }
@@ -81,7 +82,7 @@ function useSearch(props, api) {
       return text;
     }
     const keywordChars = keyword2.split("");
-    return Array.from(text).map((char, index) => keywordChars.some((kChar) => char.toLowerCase() === kChar.toLowerCase()) ? _createVNode("span", {
+    return Array.from(String(text)).map((char, index) => keywordChars.some((kChar) => char.toLowerCase() === kChar.toLowerCase()) ? _createVNode("span", {
       "class": "highlight"
     }, [char]) : char);
   };
@@ -100,7 +101,7 @@ function useSearch(props, api) {
       "key": historyItem.id,
       "onClick": () => handleHistorySelect(historyItem),
       "class": "px-16px py-8px border-b border-[#eee]"
-    }, [_createVNode("span", null, [historyItem.selectedUsers.map((user) => highlightText(user.name, keyword.value)).reduce((prev, curr) => [prev, "\uFF0C", curr])])]))])]) : "", filteredOrgList.value.length ? _createVNode(_Fragment, null, [" ", _createVNode("p", {
+    }, [_createVNode("span", null, [historyItem.selectedUsers.map((user) => highlightText(getUserInfoById(user.id), keyword.value)).reduce((prev, curr) => [prev, "\uFF0C", curr])])]))])]) : "", filteredOrgList.value.length ? _createVNode(_Fragment, null, [" ", _createVNode("p", {
       "class": "text-[14px] text-[#333] font-bold px-[16px] py-[12px] border-b border-[#eee]"
     }, [_createTextVNode("\u901A\u8BAF\u5F55")]), _createVNode("div", {
       "class": "feed-list-wrap"

package/lib/index.d.ts

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

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.14";
 function install(app) {
   const components = [
     import_md_preview.default,

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/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)[];
 };

package/lib/org-picker/useSearch.js

@@ -52,7 +52,8 @@ function useSearch(props, api) {
     searchOrgList,
     setRecentSelectedUsers,
     deleteRecentSelectedUsers,
-    getRecentSelectedUsers
+    getRecentSelectedUsers,
+    getUserInfoById
   } = api;
   const keyword = (0, import_vue2.ref)("");
   const searchRef = (0, import_vue2.ref)();
@@ -71,7 +72,7 @@ function useSearch(props, api) {
   });
   (0, import_vue2.watchEffect)(() => {
     if (keyword.value) {
-      filterRecentSelectedHistory.value = recentSelectedHistory.value.filter((item) => item.selectedUsers.some((user) => keyword.value.split("").some((char) => user.name.includes(char))));
+      filterRecentSelectedHistory.value = recentSelectedHistory.value.filter((item) => item.selectedUsers.some((user) => keyword.value.split("").some((char) => getUserInfoById(user.id).includes(char))));
     } else {
       filterRecentSelectedHistory.value = recentSelectedHistory.value;
     }
@@ -103,7 +104,7 @@ function useSearch(props, api) {
       return text;
     }
     const keywordChars = keyword2.split("");
-    return Array.from(text).map((char, index) => keywordChars.some((kChar) => char.toLowerCase() === kChar.toLowerCase()) ? (0, import_vue.createVNode)("span", {
+    return Array.from(String(text)).map((char, index) => keywordChars.some((kChar) => char.toLowerCase() === kChar.toLowerCase()) ? (0, import_vue.createVNode)("span", {
       "class": "highlight"
     }, [char]) : char);
   };
@@ -122,7 +123,7 @@ function useSearch(props, api) {
       "key": historyItem.id,
       "onClick": () => handleHistorySelect(historyItem),
       "class": "px-16px py-8px border-b border-[#eee]"
-    }, [(0, import_vue.createVNode)("span", null, [historyItem.selectedUsers.map((user) => highlightText(user.name, keyword.value)).reduce((prev, curr) => [prev, "\uFF0C", curr])])]))])]) : "", filteredOrgList.value.length ? (0, import_vue.createVNode)(import_vue.Fragment, null, [" ", (0, import_vue.createVNode)("p", {
+    }, [(0, import_vue.createVNode)("span", null, [historyItem.selectedUsers.map((user) => highlightText(getUserInfoById(user.id), keyword.value)).reduce((prev, curr) => [prev, "\uFF0C", curr])])]))])]) : "", filteredOrgList.value.length ? (0, import_vue.createVNode)(import_vue.Fragment, null, [" ", (0, import_vue.createVNode)("p", {
       "class": "text-[14px] text-[#333] font-bold px-[16px] py-[12px] border-b border-[#eee]"
     }, [(0, import_vue.createTextVNode)("\u901A\u8BAF\u5F55")]), (0, import_vue.createVNode)("div", {
       "class": "feed-list-wrap"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cgboiler/biz-mobile",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -50,8 +50,8 @@
     "@tiptap/vue-3": "3.0.0-beta.5",
     "lodash-es": "^4.17.21",
     "vant": "^4.9.19",
-    "@cgboiler/shared": "1.1.1",
-    "@cgboiler/core": "1.2.2"
+    "@cgboiler/core": "1.2.2",
+    "@cgboiler/shared": "1.1.1"
   },
   "scripts": {
     "dev": "cg-cli dev",