@cgboiler/biz-mobile 1.18.16 → 1.18.18

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.18.15";
+export const version: "1.18.17";
 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.18.15";
+const version = "1.18.17";
 function install(app) {
   const components = [
     MdPreview,

package/es/org-picker/OrgPicker.js

@@ -39,10 +39,8 @@ var stdin_default = defineComponent({
       getOrgList,
       orgList,
       deptPath,
-      userList,
       getUserInfoById,
-      getUsersByDeptId,
-      getDeptById
+      getUsersByDeptId
     } = api;
     getOrgList();
     const activeTab = ref("txl");
@@ -93,10 +91,10 @@ var stdin_default = defineComponent({
         selectedItems.value = [];
         return;
       }
-      const userList2 = yield getFinalUserList();
-      if (userList2 == null ? void 0 : userList2.length) {
+      const userList = yield getFinalUserList();
+      if (userList == null ? void 0 : userList.length) {
         selectedItems.value = newValue.map((id) => {
-          return userList2.find((item) => item.id === id);
+          return userList.find((item) => item.id === id);
         });
         updateDeptSelectionStatus();
       }
@@ -108,6 +106,20 @@ var stdin_default = defineComponent({
     }, {
       deep: true
     });
+    watch(() => props.show, (newValue) => {
+      const handleKeyDown = (event) => {
+        if (event.key === "Escape") {
+          emit("update:show", false);
+        }
+      };
+      if (newValue) {
+        window.addEventListener("keydown", handleKeyDown);
+      } else {
+        window.removeEventListener("keydown", handleKeyDown);
+      }
+    }, {
+      immediate: true
+    });
     const handleDeptSelect = (item) => {
       if (item.type !== "dept" || !props.multiple)
         return;

package/es/org-picker/useApi.js

@@ -19,7 +19,7 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 import { computed, ref } from "vue";
-import { useFetch, getUserList, getStorage, getUserInfo, removeStorage } from "@cgboiler/core";
+import { useFetch, getUserList, getUserInfo } from "@cgboiler/core";
 import { getDeptList } from "@cgboiler/core";
 import { debounce } from "lodash-es";
 const orgListCache = /* @__PURE__ */ new Map();
@@ -112,9 +112,9 @@ const useApi = () => {
     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));
   }), 300);
-  const RECENT_SELECTED_USERS_KEY = "recent_selected_users_history";
   const MAX_RECENT_SELECTIONS = 15;
   const getRecentUsers = () => __async(void 0, null, function* () {
+    var _a;
     const user = yield getUserInfo();
     let name = "";
     userList.value = yield getUserList();
@@ -129,7 +129,7 @@ const useApi = () => {
     );
     const res = yield fetchData(url);
     let recentList = [];
-    if (res.records && res.records.length) {
+    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) {
@@ -197,7 +197,6 @@ const useApi = () => {
           result = { success: true, message: responseText };
         }
       }
-      yield removeStorage(RECENT_SELECTED_USERS_KEY);
       return result;
     } catch (error) {
       console.error("Failed to add or update recent users", error);
@@ -207,14 +206,10 @@ const useApi = () => {
   const getRecentSelectedUsers = () => __async(void 0, null, function* () {
     try {
       const res = yield getRecentUsers();
-      const storageData = yield getStorage(RECENT_SELECTED_USERS_KEY);
-      let data = [];
       if (res && Array.isArray(res) && res.length > 0) {
-        data = res;
-      } else if (storageData && Array.isArray(storageData) && storageData.length > 0) {
-        data = storageData;
+        return res;
       }
-      return data || [];
+      return [];
     } catch (error) {
       console.error("Failed to get recent selected users history from localStorage", error);
       return [];

package/es/org-picker/useSearch.js

@@ -43,7 +43,9 @@ function useSearch({
   const recentSelectedHistory = ref([]);
   const filterRecentSelectedHistory = ref([]);
   watchEffect(() => __async(this, null, function* () {
-    recentSelectedHistory.value = yield getRecentSelectedUsers();
+    if (props.show && props.multiple && !recentSelectedHistory.value.length) {
+      recentSelectedHistory.value = yield getRecentSelectedUsers();
+    }
   }));
   const setRecentUsers = (users) => __async(this, null, function* () {
     yield setRecentSelectedUsers(users);

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.18.15";
+export const version: "1.18.17";
 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.18.15";
+const version = "1.18.17";
 function install(app) {
   const components = [
     import_md_preview.default,

package/lib/org-picker/OrgPicker.js

@@ -71,10 +71,8 @@ var stdin_default = (0, import_vue2.defineComponent)({
       getOrgList,
       orgList,
       deptPath,
-      userList,
       getUserInfoById,
-      getUsersByDeptId,
-      getDeptById
+      getUsersByDeptId
     } = api;
     getOrgList();
     const activeTab = (0, import_vue2.ref)("txl");
@@ -125,10 +123,10 @@ var stdin_default = (0, import_vue2.defineComponent)({
         selectedItems.value = [];
         return;
       }
-      const userList2 = yield (0, import_useApi.getFinalUserList)();
-      if (userList2 == null ? void 0 : userList2.length) {
+      const userList = yield (0, import_useApi.getFinalUserList)();
+      if (userList == null ? void 0 : userList.length) {
         selectedItems.value = newValue.map((id) => {
-          return userList2.find((item) => item.id === id);
+          return userList.find((item) => item.id === id);
         });
         updateDeptSelectionStatus();
       }
@@ -140,6 +138,20 @@ var stdin_default = (0, import_vue2.defineComponent)({
     }, {
       deep: true
     });
+    (0, import_vue2.watch)(() => props.show, (newValue) => {
+      const handleKeyDown = (event) => {
+        if (event.key === "Escape") {
+          emit("update:show", false);
+        }
+      };
+      if (newValue) {
+        window.addEventListener("keydown", handleKeyDown);
+      } else {
+        window.removeEventListener("keydown", handleKeyDown);
+      }
+    }, {
+      immediate: true
+    });
     const handleDeptSelect = (item) => {
       if (item.type !== "dept" || !props.multiple)
         return;

package/lib/org-picker/useApi.js

@@ -135,9 +135,9 @@ const useApi = () => {
     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));
   }), 300);
-  const RECENT_SELECTED_USERS_KEY = "recent_selected_users_history";
   const MAX_RECENT_SELECTIONS = 15;
   const getRecentUsers = () => __async(void 0, null, function* () {
+    var _a;
     const user = yield (0, import_core.getUserInfo)();
     let name = "";
     userList.value = yield (0, import_core.getUserList)();
@@ -152,7 +152,7 @@ const useApi = () => {
     );
     const res = yield fetchData(url);
     let recentList = [];
-    if (res.records && res.records.length) {
+    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) {
@@ -220,7 +220,6 @@ const useApi = () => {
           result = { success: true, message: responseText };
         }
       }
-      yield (0, import_core.removeStorage)(RECENT_SELECTED_USERS_KEY);
       return result;
     } catch (error) {
       console.error("Failed to add or update recent users", error);
@@ -230,14 +229,10 @@ const useApi = () => {
   const getRecentSelectedUsers = () => __async(void 0, null, function* () {
     try {
       const res = yield getRecentUsers();
-      const storageData = yield (0, import_core.getStorage)(RECENT_SELECTED_USERS_KEY);
-      let data = [];
       if (res && Array.isArray(res) && res.length > 0) {
-        data = res;
-      } else if (storageData && Array.isArray(storageData) && storageData.length > 0) {
-        data = storageData;
+        return res;
       }
-      return data || [];
+      return [];
     } catch (error) {
       console.error("Failed to get recent selected users history from localStorage", error);
       return [];

package/lib/org-picker/useSearch.js

@@ -65,7 +65,9 @@ function useSearch({
   const recentSelectedHistory = (0, import_vue2.ref)([]);
   const filterRecentSelectedHistory = (0, import_vue2.ref)([]);
   (0, import_vue2.watchEffect)(() => __async(this, null, function* () {
-    recentSelectedHistory.value = yield getRecentSelectedUsers();
+    if (props.show && props.multiple && !recentSelectedHistory.value.length) {
+      recentSelectedHistory.value = yield getRecentSelectedUsers();
+    }
   }));
   const setRecentUsers = (users) => __async(this, null, function* () {
     yield setRecentSelectedUsers(users);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cgboiler/biz-mobile",
-  "version": "1.18.16",
+  "version": "1.18.18",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -52,8 +52,8 @@
     "lodash-es": "^4.17.21",
     "vant": "^4.9.19",
     "@cgboiler/core": "1.2.10",
-    "@cgboiler/shared": "1.1.2",
-    "@cgboiler/biz-basic": "1.0.18"
+    "@cgboiler/biz-basic": "1.0.37",
+    "@cgboiler/shared": "1.1.2"
   },
   "scripts": {
     "dev": "cg-cli dev",