@cgboiler/biz-mobile 1.18.11 → 1.18.13

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

package/es/org-picker/OrgPicker.js

@@ -1,10 +1,30 @@
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 import { createVNode as _createVNode, createTextVNode as _createTextVNode, Fragment as _Fragment } from "vue";
 import "./_atomic.css";
 import { defineComponent, ref, computed, watch } from "vue";
 import { ActionSheet, Search, List, Image, Empty, Tabs, Tab, Icon } from "vant";
 import DeptImg from "./components/DeptImg";
 import { orgPickerProps } from "./types";
-import { useApi } from "./useApi";
+import { useApi, getFinalUserList } from "./useApi";
 import "./index.css";
 import { useSearch } from "./useSearch";
 var stdin_default = defineComponent({
@@ -68,19 +88,19 @@ var stdin_default = defineComponent({
       const personnel = orgList.value.filter((item) => item.type !== "dept");
       return [...personnel, ...departments];
     });
-    watch(() => props.modelValue, (newValue) => {
-      var _a;
+    watch(() => props.modelValue, (newValue) => __async(this, null, function* () {
       if (!newValue) {
         selectedItems.value = [];
         return;
       }
-      if ((_a = userList.value) == null ? void 0 : _a.length) {
+      const userList2 = yield getFinalUserList();
+      if (userList2 == null ? void 0 : userList2.length) {
         selectedItems.value = newValue.map((id) => {
-          return userList.value.find((item) => item.id === id);
+          return userList2.find((item) => item.id === id);
         });
         updateDeptSelectionStatus();
       }
-    }, {
+    }), {
       immediate: true
     });
     watch(() => selectedItems.value, () => {

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

@@ -1,4 +1,5 @@
 import { type OrgItem, RecentSelection } from './types';
+export declare function getFinalUserList(): Promise<any[]>;
 export declare const useApi: () => {
     userList: import("vue").Ref<{
         [x: string]: any;

package/es/org-picker/useApi.js

@@ -65,6 +65,15 @@ function initDeptList() {
 }
 initUserList();
 initDeptList();
+function getFinalUserList() {
+  return __async(this, null, function* () {
+    var _a;
+    if ((_a = userList.value) == null ? void 0 : _a.length) {
+      return userList.value;
+    }
+    return yield getUserList();
+  });
+}
 const useApi = () => {
   const orgList = ref([]);
   const orgSearchList = ref([]);
@@ -101,9 +110,7 @@ const useApi = () => {
     }
     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
-    );
+    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;
@@ -261,9 +268,7 @@ const useApi = () => {
   };
   const getUsersByDeptId = (deptId) => {
     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);
     users.push(...directUsers);
     const childDepts = deptList.value.filter((dept) => dept.parentId === deptId);
     childDepts.forEach((childDept) => {
@@ -293,5 +298,6 @@ const useApi = () => {
   };
 };
 export {
+  getFinalUserList,
   useApi
 };

package/es/org-picker/useSearch.js

@@ -101,20 +101,7 @@ function useSearch({
   }) => {
     return _createVNode("div", {
       "class": "absolute top-0 left-0 right-0 bottom-0 bg-[#fff] z-1 overflow-auto"
-    }, [filterRecentSelectedHistory.value.length && props.multiple ? _createVNode(_Fragment, null, [_createVNode("p", {
-      "class": "text-[14px] text-[#333] font-bold px-[16px] py-[12px] border-b border-[#eee]"
-    }, [_createTextVNode("\u6700\u8FD1\u9009\u62E9")]), _createVNode("div", {
-      "class": "recent-list-wrap flex-1 py-[8px]"
-    }, [filterRecentSelectedHistory.value.map((historyItem) => _createVNode("div", {
-      "key": historyItem.id,
-      "onClick": () => handleHistorySelect(historyItem),
-      "class": "px-16px py-8px border-b border-[#eee]"
-    }, [_createVNode("span", null, [historyItem.selectedUsers.map((user) => {
-      var _a;
-      return highlightText((_a = getUserInfoById(user.id)) == null ? void 0 : _a.name, 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", {
+    }, [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"

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

package/lib/org-picker/OrgPicker.js

@@ -25,6 +25,26 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 var stdin_exports = {};
 __export(stdin_exports, {
   default: () => stdin_default
@@ -100,19 +120,19 @@ var stdin_default = (0, import_vue2.defineComponent)({
       const personnel = orgList.value.filter((item) => item.type !== "dept");
       return [...personnel, ...departments];
     });
-    (0, import_vue2.watch)(() => props.modelValue, (newValue) => {
-      var _a;
+    (0, import_vue2.watch)(() => props.modelValue, (newValue) => __async(this, null, function* () {
       if (!newValue) {
         selectedItems.value = [];
         return;
       }
-      if ((_a = userList.value) == null ? void 0 : _a.length) {
+      const userList2 = yield (0, import_useApi.getFinalUserList)();
+      if (userList2 == null ? void 0 : userList2.length) {
         selectedItems.value = newValue.map((id) => {
-          return userList.value.find((item) => item.id === id);
+          return userList2.find((item) => item.id === id);
         });
         updateDeptSelectionStatus();
       }
-    }, {
+    }), {
       immediate: true
     });
     (0, import_vue2.watch)(() => selectedItems.value, () => {

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

@@ -1,4 +1,5 @@
 import { type OrgItem, RecentSelection } from './types';
+export declare function getFinalUserList(): Promise<any[]>;
 export declare const useApi: () => {
     userList: import("vue").Ref<{
         [x: string]: any;

package/lib/org-picker/useApi.js

@@ -37,6 +37,7 @@ var __async = (__this, __arguments, generator) => {
 };
 var stdin_exports = {};
 __export(stdin_exports, {
+  getFinalUserList: () => getFinalUserList,
   useApi: () => useApi
 });
 module.exports = __toCommonJS(stdin_exports);
@@ -87,6 +88,15 @@ function initDeptList() {
 }
 initUserList();
 initDeptList();
+function getFinalUserList() {
+  return __async(this, null, function* () {
+    var _a;
+    if ((_a = userList.value) == null ? void 0 : _a.length) {
+      return userList.value;
+    }
+    return yield (0, import_core.getUserList)();
+  });
+}
 const useApi = () => {
   const orgList = (0, import_vue.ref)([]);
   const orgSearchList = (0, import_vue.ref)([]);
@@ -123,9 +133,7 @@ const useApi = () => {
     }
     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
-    );
+    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;
@@ -283,9 +291,7 @@ const useApi = () => {
   };
   const getUsersByDeptId = (deptId) => {
     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);
     users.push(...directUsers);
     const childDepts = deptList.value.filter((dept) => dept.parentId === deptId);
     childDepts.forEach((childDept) => {

package/lib/org-picker/useSearch.js

@@ -123,20 +123,7 @@ function useSearch({
   }) => {
     return (0, import_vue.createVNode)("div", {
       "class": "absolute top-0 left-0 right-0 bottom-0 bg-[#fff] z-1 overflow-auto"
-    }, [filterRecentSelectedHistory.value.length && props.multiple ? (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)("\u6700\u8FD1\u9009\u62E9")]), (0, import_vue.createVNode)("div", {
-      "class": "recent-list-wrap flex-1 py-[8px]"
-    }, [filterRecentSelectedHistory.value.map((historyItem) => (0, import_vue.createVNode)("div", {
-      "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) => {
-      var _a;
-      return highlightText((_a = getUserInfoById(user.id)) == null ? void 0 : _a.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", {
-      "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", {
+    }, [filteredOrgList.value.length ? (0, import_vue.createVNode)(import_vue.Fragment, null, [" ", (0, import_vue.createVNode)("div", {
       "class": "px-16px"
     }, [filteredOrgList.value.length === 0 ? (0, import_vue.createVNode)(import_vant.Empty, {
       "description": "\u672A\u627E\u5230\u76F8\u5173\u4EBA\u5458"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cgboiler/biz-mobile",
-  "version": "1.18.11",
+  "version": "1.18.13",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -52,7 +52,7 @@
     "vant": "^4.9.19",
     "@cgboiler/core": "1.2.8",
     "@cgboiler/shared": "1.1.1",
-    "@cgboiler/biz-basic": "1.0.9"
+    "@cgboiler/biz-basic": "1.0.14"
   },
   "scripts": {
     "dev": "cg-cli dev",