@cgboiler/biz-mobile 1.10.0 → 1.12.0

package/es/index.d.ts

@@ -6,7 +6,7 @@ declare namespace _default {
 }
 export default _default;
 export function install(app: any): void;
-export const version: "1.9.0";
+export const version: "1.11.0";
 import OrgPicker from './org-picker';
 import ProjectSelect from './project-select';
 export { OrgPicker, ProjectSelect };

package/es/index.js

@@ -1,6 +1,6 @@
 import OrgPicker from "./org-picker";
 import ProjectSelect from "./project-select";
-const version = "1.9.0";
+const version = "1.11.0";
 function install(app) {
   const components = [
     OrgPicker,

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

@@ -17,10 +17,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         default: boolean;
     };
     'onUpdate:modelValue': {
-        type: import("vue").PropType<(val: (string | number)[] | null) => void>;
+        type: FunctionConstructor;
     };
     'onUpdate:show': {
-        type: import("vue").PropType<(val: boolean) => void>;
+        type: FunctionConstructor;
     };
 }>, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:show" | "update:modelValue")[], "update:show" | "update:modelValue", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     modelValue: {
@@ -40,10 +40,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         default: boolean;
     };
     'onUpdate:modelValue': {
-        type: import("vue").PropType<(val: (string | number)[] | null) => void>;
+        type: FunctionConstructor;
     };
     'onUpdate:show': {
-        type: import("vue").PropType<(val: boolean) => void>;
+        type: FunctionConstructor;
     };
 }>> & Readonly<{
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;

package/es/org-picker/OrgPicker.js

@@ -22,7 +22,7 @@ import { createVNode as _createVNode, createTextVNode as _createTextVNode } from
 import "./_atomic.css";
 import { defineComponent, ref, computed, watch, nextTick } from "vue";
 import { ActionSheet, Search, List, Image, Empty } from "vant";
-import DeptImg from "./components/deptImg";
+import DeptImg from "./components/DeptImg";
 import { orgPickerProps } from "./types";
 import { useApi } from "./useApi";
 import "./index.css";
@@ -44,18 +44,16 @@ var stdin_default = defineComponent({
     getOrgList();
     const selectedItems = ref([]);
     watch(() => props.modelValue, (newValue) => {
+      var _a;
       if (!newValue) {
         selectedItems.value = [];
         return;
       }
-      setTimeout(() => {
-        var _a;
-        if ((_a = userList.value) == null ? void 0 : _a.length) {
-          selectedItems.value = newValue.map((id) => {
-            return userList.value.find((item) => item.id === id);
-          });
-        }
-      }, 500);
+      if ((_a = userList.value) == null ? void 0 : _a.length) {
+        selectedItems.value = newValue.map((id) => {
+          return userList.value.find((item) => item.id === id);
+        });
+      }
     }, {
       immediate: true
     });
@@ -65,13 +63,10 @@ var stdin_default = defineComponent({
         return;
       }
       if (props.multiple) {
-        const currentValue = props.modelValue ? [...props.modelValue] : [];
-        const index = currentValue.indexOf(item.id);
+        const index = selectedItems.value.findIndex((s) => s.id === item.id);
         if (index > -1) {
-          currentValue.splice(index, 1);
-          selectedItems.value = selectedItems.value.filter((selected) => selected.id !== item.id);
+          selectedItems.value.splice(index, 1);
         } else {
-          currentValue.push(item.id);
           selectedItems.value.push(item);
         }
       } else {
@@ -89,12 +84,10 @@ var stdin_default = defineComponent({
     const finished = ref(true);
     const searchRef = ref();
     watch(() => props.show, (newVal) => __async(this, null, function* () {
+      var _a;
       if (newVal && props.autoFocus) {
         yield nextTick();
-        setTimeout(() => {
-          var _a;
-          (_a = searchRef.value) == null ? void 0 : _a.focus();
-        }, 300);
+        (_a = searchRef.value) == null ? void 0 : _a.focus();
       }
     }));
     watch(keyword, (newKeyword) => {
@@ -113,9 +106,7 @@ var stdin_default = defineComponent({
       return [...personnel, ...departments];
     });
     const isSelected = (item) => {
-      if (!props.modelValue)
-        return false;
-      return props.modelValue.includes(item.id);
+      return selectedItems.value.some((s) => s.id === item.id);
     };
     const onLoad = () => {
       finished.value = true;
@@ -148,8 +139,8 @@ var stdin_default = defineComponent({
         "class": "separator"
       }, [_createTextVNode(" / ")])]))]), _createVNode("div", {
         "class": "feed-list-wrap"
-      }, [!keyword.value && filteredOrgList.value.filter((item) => item.type !== "dept").length === 0 ? _createVNode(Empty, {
-        "description": "\u8BE5\u90E8\u95E8\u4E0B\u6CA1\u6709\u4EBA\u5458"
+      }, [filteredOrgList.value.length === 0 ? _createVNode(Empty, {
+        "description": keyword.value ? "\u672A\u627E\u5230\u76F8\u5173\u4EBA\u5458" : "\u8BE5\u90E8\u95E8\u4E0B\u6CA1\u6709\u4EBA\u5458"
       }, null) : _createVNode(List, {
         "loading": loading.value,
         "finished": finished.value,
@@ -158,7 +149,7 @@ var stdin_default = defineComponent({
         default: () => [filteredOrgList.value.map((item) => _createVNode("div", {
           "class": ["org-item", isSelected(item) ? "selected" : ""],
           "onClick": () => handleSelect(item)
-        }, [item.type === "dept" ? _createVNode("div", {
+        }, [item.type === "dept" && !keyword.value ? _createVNode("div", {
           "class": "org-avatar"
         }, [_createVNode(DeptImg, null, null)]) : _createVNode(Image, {
           "class": "org-avatar",
@@ -166,24 +157,7 @@ var stdin_default = defineComponent({
         }, null), _createVNode("div", {
           "class": "org-name"
         }, [item.name])]))]
-      }), keyword.value && _createVNode(List, {
-        "loading": loading.value,
-        "finished": finished.value,
-        "onLoad": onLoad,
-        "class": "search-result-list"
-      }, {
-        default: () => [filteredOrgList.value.filter((item) => item.type !== "dept").map((item) => _createVNode("div", {
-          "class": ["org-item", isSelected(item) ? "selected" : ""],
-          "onClick": () => handleSelect(item)
-        }, [_createVNode(Image, {
-          "class": "org-avatar",
-          "src": item.avatar
-        }, null), _createVNode("div", {
-          "class": "org-name"
-        }, [item.name])]))]
-      }), keyword.value && filteredOrgList.value.filter((item) => item.type !== "dept").length === 0 && _createVNode("div", {
-        "class": "empty-search-result"
-      }, [_createTextVNode("\u672A\u627E\u5230\u76F8\u5173\u4EBA\u5458")])]), props.multiple && _createVNode("div", {
+      })]), props.multiple && _createVNode("div", {
         "class": "bottom-section"
       }, [selectedItems.value.length > 0 && _createVNode("div", {
         "class": "selected-items"

package/es/org-picker/index.css

@@ -1 +1 @@
-:root:root{--van-action-sheet-max-height: 100%}.org-list{height:85vh;display:flex;flex-direction:column}.org-list .breadcrumb-nav{margin-bottom:4px;padding:2px 16px;border-radius:4px;font-size:12px}.org-list .breadcrumb-nav .dept-name.current-dept{color:#969799}.org-list .breadcrumb-nav .separator{color:#969799;margin:0 4px}.org-list .search-bar{position:-webkit-sticky;position:-webkit-sticky;position:sticky;top:0;z-index:1}.org-list .bottom-section{border-top:1px solid #eee;background-color:#fff}.org-list .bottom-section .selected-items{display:flex;flex-wrap:nowrap;padding:12px 16px;gap:12px;background-color:#fff;overflow-x:auto}.org-list .bottom-section .selected-items .selected-tag{flex-shrink:0;background:none;border:none;padding:0;margin:0}.org-list .bottom-section .selected-items .selected-tag .tag-avatar{width:36px;height:36px}.org-list .bottom-section .selected-items .selected-tag .tag-avatar img{border-radius:4px;border:1px solid #eee;object-fit:contain}.org-list .van-list{flex:1;overflow-y:auto;padding:0 16px}.org-list .feed-list-wrap{flex:1;display:flex;overflow:hidden;position:relative;justify-content:center}.org-list .search-result-list{position:absolute;top:0;left:0;right:0;bottom:0;z-index:1;background-color:#fff;overflow-y:auto;padding:0 16px}.org-list .org-item{padding:12px 0;border-bottom:1px solid #eee;cursor:pointer;display:flex;align-items:center;gap:12px}.org-list .org-item.selected{color:var(--van-primary-color)}.org-list .org-item .org-avatar{flex-shrink:0;width:40px;height:40px;display:flex;align-items:center;justify-content:center}.org-list .org-item .org-avatar img{border-radius:4px;border:1px solid #eee;object-fit:contain}.org-list .org-item .org-name{font-size:14px;flex:1}.org-list .org-item:last-child{border-bottom:none}.org-list .action-buttons{padding:16px;display:flex;justify-content:center;border-top:1px solid #eee}.org-list .action-buttons .confirm-button{background-color:var(--van-primary-color);color:#fff;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}.org-list .breadcrumb-nav{margin-bottom:4px;padding:2px 16px;border-radius:4px;font-size:12px}.org-list .breadcrumb-nav .dept-name.current-dept{color:#969799}.org-list .breadcrumb-nav .separator{color:#969799;margin:0 4px}.org-list .search-bar{position:-webkit-sticky;position:-webkit-sticky;position:sticky;top:0;z-index:1}.org-list .bottom-section{border-top:1px solid #eee;background-color:#fff}.org-list .bottom-section .selected-items{display:flex;flex-wrap:nowrap;padding:12px 16px;gap:12px;background-color:#fff;overflow-x:auto;height:63px}.org-list .bottom-section .selected-items .selected-tag{flex-shrink:0;background:none;border:none;padding:0;margin:0}.org-list .bottom-section .selected-items .selected-tag .tag-avatar{width:36px;height:36px}.org-list .bottom-section .selected-items .selected-tag .tag-avatar img{border-radius:4px;border:1px solid #eee;object-fit:contain}.org-list .van-list{flex:1;overflow-y:auto;padding:0 16px}.org-list .feed-list-wrap{flex:1;display:flex;overflow:hidden;position:relative;justify-content:center}.org-list .search-result-list{position:absolute;top:0;left:0;right:0;bottom:0;z-index:1;background-color:#fff;overflow-y:auto;padding:0 16px}.org-list .org-item{padding:12px 0;border-bottom:1px solid #eee;cursor:pointer;display:flex;align-items:center;gap:12px}.org-list .org-item.selected{color:var(--van-primary-color)}.org-list .org-item .org-avatar{flex-shrink:0;width:40px;height:40px;display:flex;align-items:center;justify-content:center}.org-list .org-item .org-avatar img{border-radius:4px;border:1px solid #eee;object-fit:contain}.org-list .org-item .org-name{font-size:14px;flex:1}.org-list .org-item:last-child{border-bottom:none}.org-list .action-buttons{padding:16px;display:flex;justify-content:center;border-top:1px solid #eee}.org-list .action-buttons .confirm-button{background-color:var(--van-primary-color);color:#fff;padding:10px 0;border-radius:4px;text-align:center;width:100%;font-size:14px}

package/es/org-picker/index.less

@@ -41,6 +41,7 @@
       gap: 12px;
       background-color: #fff;
       overflow-x: auto;
+      height: 63px;
 
       .selected-tag {
         flex-shrink: 0;

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

@@ -4,6 +4,7 @@ export interface OrgItem {
     name: string;
     type: string;
     avatar?: string;
+    [x: string]: any;
 }
 export declare const orgPickerProps: {
     modelValue: {
@@ -23,10 +24,10 @@ export declare const orgPickerProps: {
         default: boolean;
     };
     'onUpdate:modelValue': {
-        type: PropType<(val: (string | number)[] | null) => void>;
+        type: FunctionConstructor;
     };
     'onUpdate:show': {
-        type: PropType<(val: boolean) => void>;
+        type: FunctionConstructor;
     };
 };
 export type OrgPickerProps = ExtractPropTypes<typeof orgPickerProps>;

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

@@ -1,12 +1,26 @@
 import { type OrgItem } from './types';
 export declare const useApi: () => {
-    userList: import("vue").Ref<never[], never[]>;
+    userList: import("vue").Ref<{
+        [x: string]: any;
+        id: string | number;
+        name: string;
+        type: string;
+        avatar?: string | undefined;
+    }[], OrgItem[] | {
+        [x: string]: any;
+        id: string | number;
+        name: string;
+        type: string;
+        avatar?: string | undefined;
+    }[]>;
     orgList: import("vue").Ref<{
+        [x: string]: any;
         id: string | number;
         name: string;
         type: string;
         avatar?: string | undefined;
     }[], OrgItem[] | {
+        [x: string]: any;
         id: string | number;
         name: string;
         type: string;

package/es/org-picker/useApi.js

@@ -19,30 +19,30 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 import { ref } from "vue";
-import { useFetch } from "@cgboiler/core";
+import { useFetch, getUserList } from "@cgboiler/core";
 import { debounce } from "lodash-es";
 const orgListCache = /* @__PURE__ */ new Map();
-const fetchOrgList = (deptId) => __async(void 0, null, function* () {
-  if (orgListCache.has(deptId || "")) {
-    return orgListCache.get(deptId || "");
+const fetchData = (url, cacheKey) => __async(void 0, null, function* () {
+  if (cacheKey && orgListCache.has(cacheKey)) {
+    return orgListCache.get(cacheKey);
+  }
+  const res = (yield useFetch(url, { method: "GET" })) || [];
+  if (cacheKey) {
+    orgListCache.set(cacheKey, res);
   }
-  const res = (yield useFetch(
-    `https://wflow.cgboiler.com/v1/oa/org/tree/cloud?deptId=${deptId}&type=user`,
-    {
-      method: "GET"
-    }
-  )) || [];
-  orgListCache.set(deptId || "", res);
   return res;
 });
-const userList = ref([]);
-const fetchUserList = () => __async(void 0, null, function* () {
-  const res = (yield useFetch(`https://wflow.cgboiler.com/v1/oa/org/alluserbycompanyid`, {
-    method: "GET"
-  })) || [];
-  userList.value = res;
+const fetchOrgList = (deptId) => __async(void 0, null, function* () {
+  const url = `https://wflow.cgboiler.com/v1/oa/org/tree/cloud?deptId=${deptId}&type=user`;
+  return fetchData(url, deptId || "");
 });
-fetchUserList();
+const userList = ref([]);
+function initUserList() {
+  return __async(this, null, function* () {
+    userList.value = yield getUserList();
+  });
+}
+initUserList();
 const useApi = () => {
   const orgList = ref([]);
   const currentDeptId = ref("1");
@@ -68,13 +68,8 @@ const useApi = () => {
       orgList.value = [];
       return;
     }
-    const res = yield useFetch(
-      `https://wflow.cgboiler.com/v1/oa/org/tree/user/search/cloud?userName=${userName}`,
-      {
-        method: "GET"
-      }
-    );
-    orgList.value = res || [];
+    const url = `https://wflow.cgboiler.com/v1/oa/org/tree/user/search/cloud?userName=${userName}`;
+    orgList.value = yield fetchData(url);
   }), 300);
   return {
     userList,

package/lib/index.d.ts

@@ -6,7 +6,7 @@ declare namespace _default {
 }
 export default _default;
 export function install(app: any): void;
-export const version: "1.9.0";
+export const version: "1.11.0";
 import OrgPicker from './org-picker';
 import ProjectSelect from './project-select';
 export { OrgPicker, ProjectSelect };

package/lib/index.js

@@ -39,7 +39,7 @@ var import_org_picker = __toESM(require("./org-picker"));
 var import_project_select = __toESM(require("./project-select"));
 __reExport(stdin_exports, require("./org-picker"), module.exports);
 __reExport(stdin_exports, require("./project-select"), module.exports);
-const version = "1.9.0";
+const version = "1.11.0";
 function install(app) {
   const components = [
     import_org_picker.default,

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

@@ -17,10 +17,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         default: boolean;
     };
     'onUpdate:modelValue': {
-        type: import("vue").PropType<(val: (string | number)[] | null) => void>;
+        type: FunctionConstructor;
     };
     'onUpdate:show': {
-        type: import("vue").PropType<(val: boolean) => void>;
+        type: FunctionConstructor;
     };
 }>, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:show" | "update:modelValue")[], "update:show" | "update:modelValue", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     modelValue: {
@@ -40,10 +40,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         default: boolean;
     };
     'onUpdate:modelValue': {
-        type: import("vue").PropType<(val: (string | number)[] | null) => void>;
+        type: FunctionConstructor;
     };
     'onUpdate:show': {
-        type: import("vue").PropType<(val: boolean) => void>;
+        type: FunctionConstructor;
     };
 }>> & Readonly<{
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;

package/lib/org-picker/OrgPicker.js

@@ -54,7 +54,7 @@ var import_vue = require("vue");
 var import_atomic = require("./_atomic.css");
 var import_vue2 = require("vue");
 var import_vant = require("vant");
-var import_deptImg = __toESM(require("./components/deptImg"));
+var import_DeptImg = __toESM(require("./components/DeptImg"));
 var import_types = require("./types");
 var import_useApi = require("./useApi");
 var import_index = require("./index.css");
@@ -76,18 +76,16 @@ var stdin_default = (0, import_vue2.defineComponent)({
     getOrgList();
     const selectedItems = (0, import_vue2.ref)([]);
     (0, import_vue2.watch)(() => props.modelValue, (newValue) => {
+      var _a;
       if (!newValue) {
         selectedItems.value = [];
         return;
       }
-      setTimeout(() => {
-        var _a;
-        if ((_a = userList.value) == null ? void 0 : _a.length) {
-          selectedItems.value = newValue.map((id) => {
-            return userList.value.find((item) => item.id === id);
-          });
-        }
-      }, 500);
+      if ((_a = userList.value) == null ? void 0 : _a.length) {
+        selectedItems.value = newValue.map((id) => {
+          return userList.value.find((item) => item.id === id);
+        });
+      }
     }, {
       immediate: true
     });
@@ -97,13 +95,10 @@ var stdin_default = (0, import_vue2.defineComponent)({
         return;
       }
       if (props.multiple) {
-        const currentValue = props.modelValue ? [...props.modelValue] : [];
-        const index = currentValue.indexOf(item.id);
+        const index = selectedItems.value.findIndex((s) => s.id === item.id);
         if (index > -1) {
-          currentValue.splice(index, 1);
-          selectedItems.value = selectedItems.value.filter((selected) => selected.id !== item.id);
+          selectedItems.value.splice(index, 1);
         } else {
-          currentValue.push(item.id);
           selectedItems.value.push(item);
         }
       } else {
@@ -121,12 +116,10 @@ var stdin_default = (0, import_vue2.defineComponent)({
     const finished = (0, import_vue2.ref)(true);
     const searchRef = (0, import_vue2.ref)();
     (0, import_vue2.watch)(() => props.show, (newVal) => __async(this, null, function* () {
+      var _a;
       if (newVal && props.autoFocus) {
         yield (0, import_vue2.nextTick)();
-        setTimeout(() => {
-          var _a;
-          (_a = searchRef.value) == null ? void 0 : _a.focus();
-        }, 300);
+        (_a = searchRef.value) == null ? void 0 : _a.focus();
       }
     }));
     (0, import_vue2.watch)(keyword, (newKeyword) => {
@@ -145,9 +138,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
       return [...personnel, ...departments];
     });
     const isSelected = (item) => {
-      if (!props.modelValue)
-        return false;
-      return props.modelValue.includes(item.id);
+      return selectedItems.value.some((s) => s.id === item.id);
     };
     const onLoad = () => {
       finished.value = true;
@@ -180,8 +171,8 @@ var stdin_default = (0, import_vue2.defineComponent)({
         "class": "separator"
       }, [(0, import_vue.createTextVNode)(" / ")])]))]), (0, import_vue.createVNode)("div", {
         "class": "feed-list-wrap"
-      }, [!keyword.value && filteredOrgList.value.filter((item) => item.type !== "dept").length === 0 ? (0, import_vue.createVNode)(import_vant.Empty, {
-        "description": "\u8BE5\u90E8\u95E8\u4E0B\u6CA1\u6709\u4EBA\u5458"
+      }, [filteredOrgList.value.length === 0 ? (0, import_vue.createVNode)(import_vant.Empty, {
+        "description": keyword.value ? "\u672A\u627E\u5230\u76F8\u5173\u4EBA\u5458" : "\u8BE5\u90E8\u95E8\u4E0B\u6CA1\u6709\u4EBA\u5458"
       }, null) : (0, import_vue.createVNode)(import_vant.List, {
         "loading": loading.value,
         "finished": finished.value,
@@ -190,32 +181,15 @@ var stdin_default = (0, import_vue2.defineComponent)({
         default: () => [filteredOrgList.value.map((item) => (0, import_vue.createVNode)("div", {
           "class": ["org-item", isSelected(item) ? "selected" : ""],
           "onClick": () => handleSelect(item)
-        }, [item.type === "dept" ? (0, import_vue.createVNode)("div", {
+        }, [item.type === "dept" && !keyword.value ? (0, import_vue.createVNode)("div", {
           "class": "org-avatar"
-        }, [(0, import_vue.createVNode)(import_deptImg.default, null, null)]) : (0, import_vue.createVNode)(import_vant.Image, {
-          "class": "org-avatar",
-          "src": item.avatar
-        }, null), (0, import_vue.createVNode)("div", {
-          "class": "org-name"
-        }, [item.name])]))]
-      }), keyword.value && (0, import_vue.createVNode)(import_vant.List, {
-        "loading": loading.value,
-        "finished": finished.value,
-        "onLoad": onLoad,
-        "class": "search-result-list"
-      }, {
-        default: () => [filteredOrgList.value.filter((item) => item.type !== "dept").map((item) => (0, import_vue.createVNode)("div", {
-          "class": ["org-item", isSelected(item) ? "selected" : ""],
-          "onClick": () => handleSelect(item)
-        }, [(0, import_vue.createVNode)(import_vant.Image, {
+        }, [(0, import_vue.createVNode)(import_DeptImg.default, null, null)]) : (0, import_vue.createVNode)(import_vant.Image, {
           "class": "org-avatar",
           "src": item.avatar
         }, null), (0, import_vue.createVNode)("div", {
           "class": "org-name"
         }, [item.name])]))]
-      }), keyword.value && filteredOrgList.value.filter((item) => item.type !== "dept").length === 0 && (0, import_vue.createVNode)("div", {
-        "class": "empty-search-result"
-      }, [(0, import_vue.createTextVNode)("\u672A\u627E\u5230\u76F8\u5173\u4EBA\u5458")])]), props.multiple && (0, import_vue.createVNode)("div", {
+      })]), props.multiple && (0, import_vue.createVNode)("div", {
         "class": "bottom-section"
       }, [selectedItems.value.length > 0 && (0, import_vue.createVNode)("div", {
         "class": "selected-items"

package/lib/org-picker/index.css

@@ -1 +1 @@
-:root:root{--van-action-sheet-max-height: 100%}.org-list{height:85vh;display:flex;flex-direction:column}.org-list .breadcrumb-nav{margin-bottom:4px;padding:2px 16px;border-radius:4px;font-size:12px}.org-list .breadcrumb-nav .dept-name.current-dept{color:#969799}.org-list .breadcrumb-nav .separator{color:#969799;margin:0 4px}.org-list .search-bar{position:-webkit-sticky;position:-webkit-sticky;position:sticky;top:0;z-index:1}.org-list .bottom-section{border-top:1px solid #eee;background-color:#fff}.org-list .bottom-section .selected-items{display:flex;flex-wrap:nowrap;padding:12px 16px;gap:12px;background-color:#fff;overflow-x:auto}.org-list .bottom-section .selected-items .selected-tag{flex-shrink:0;background:none;border:none;padding:0;margin:0}.org-list .bottom-section .selected-items .selected-tag .tag-avatar{width:36px;height:36px}.org-list .bottom-section .selected-items .selected-tag .tag-avatar img{border-radius:4px;border:1px solid #eee;object-fit:contain}.org-list .van-list{flex:1;overflow-y:auto;padding:0 16px}.org-list .feed-list-wrap{flex:1;display:flex;overflow:hidden;position:relative;justify-content:center}.org-list .search-result-list{position:absolute;top:0;left:0;right:0;bottom:0;z-index:1;background-color:#fff;overflow-y:auto;padding:0 16px}.org-list .org-item{padding:12px 0;border-bottom:1px solid #eee;cursor:pointer;display:flex;align-items:center;gap:12px}.org-list .org-item.selected{color:var(--van-primary-color)}.org-list .org-item .org-avatar{flex-shrink:0;width:40px;height:40px;display:flex;align-items:center;justify-content:center}.org-list .org-item .org-avatar img{border-radius:4px;border:1px solid #eee;object-fit:contain}.org-list .org-item .org-name{font-size:14px;flex:1}.org-list .org-item:last-child{border-bottom:none}.org-list .action-buttons{padding:16px;display:flex;justify-content:center;border-top:1px solid #eee}.org-list .action-buttons .confirm-button{background-color:var(--van-primary-color);color:#fff;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}.org-list .breadcrumb-nav{margin-bottom:4px;padding:2px 16px;border-radius:4px;font-size:12px}.org-list .breadcrumb-nav .dept-name.current-dept{color:#969799}.org-list .breadcrumb-nav .separator{color:#969799;margin:0 4px}.org-list .search-bar{position:-webkit-sticky;position:-webkit-sticky;position:sticky;top:0;z-index:1}.org-list .bottom-section{border-top:1px solid #eee;background-color:#fff}.org-list .bottom-section .selected-items{display:flex;flex-wrap:nowrap;padding:12px 16px;gap:12px;background-color:#fff;overflow-x:auto;height:63px}.org-list .bottom-section .selected-items .selected-tag{flex-shrink:0;background:none;border:none;padding:0;margin:0}.org-list .bottom-section .selected-items .selected-tag .tag-avatar{width:36px;height:36px}.org-list .bottom-section .selected-items .selected-tag .tag-avatar img{border-radius:4px;border:1px solid #eee;object-fit:contain}.org-list .van-list{flex:1;overflow-y:auto;padding:0 16px}.org-list .feed-list-wrap{flex:1;display:flex;overflow:hidden;position:relative;justify-content:center}.org-list .search-result-list{position:absolute;top:0;left:0;right:0;bottom:0;z-index:1;background-color:#fff;overflow-y:auto;padding:0 16px}.org-list .org-item{padding:12px 0;border-bottom:1px solid #eee;cursor:pointer;display:flex;align-items:center;gap:12px}.org-list .org-item.selected{color:var(--van-primary-color)}.org-list .org-item .org-avatar{flex-shrink:0;width:40px;height:40px;display:flex;align-items:center;justify-content:center}.org-list .org-item .org-avatar img{border-radius:4px;border:1px solid #eee;object-fit:contain}.org-list .org-item .org-name{font-size:14px;flex:1}.org-list .org-item:last-child{border-bottom:none}.org-list .action-buttons{padding:16px;display:flex;justify-content:center;border-top:1px solid #eee}.org-list .action-buttons .confirm-button{background-color:var(--van-primary-color);color:#fff;padding:10px 0;border-radius:4px;text-align:center;width:100%;font-size:14px}

package/lib/org-picker/index.less

@@ -41,6 +41,7 @@
       gap: 12px;
       background-color: #fff;
       overflow-x: auto;
+      height: 63px;
 
       .selected-tag {
         flex-shrink: 0;

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

@@ -4,6 +4,7 @@ export interface OrgItem {
     name: string;
     type: string;
     avatar?: string;
+    [x: string]: any;
 }
 export declare const orgPickerProps: {
     modelValue: {
@@ -23,10 +24,10 @@ export declare const orgPickerProps: {
         default: boolean;
     };
     'onUpdate:modelValue': {
-        type: PropType<(val: (string | number)[] | null) => void>;
+        type: FunctionConstructor;
     };
     'onUpdate:show': {
-        type: PropType<(val: boolean) => void>;
+        type: FunctionConstructor;
     };
 };
 export type OrgPickerProps = ExtractPropTypes<typeof orgPickerProps>;

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

@@ -1,12 +1,26 @@
 import { type OrgItem } from './types';
 export declare const useApi: () => {
-    userList: import("vue").Ref<never[], never[]>;
+    userList: import("vue").Ref<{
+        [x: string]: any;
+        id: string | number;
+        name: string;
+        type: string;
+        avatar?: string | undefined;
+    }[], OrgItem[] | {
+        [x: string]: any;
+        id: string | number;
+        name: string;
+        type: string;
+        avatar?: string | undefined;
+    }[]>;
     orgList: import("vue").Ref<{
+        [x: string]: any;
         id: string | number;
         name: string;
         type: string;
         avatar?: string | undefined;
     }[], OrgItem[] | {
+        [x: string]: any;
         id: string | number;
         name: string;
         type: string;

package/lib/org-picker/useApi.js

@@ -44,27 +44,27 @@ var import_vue = require("vue");
 var import_core = require("@cgboiler/core");
 var import_lodash_es = require("lodash-es");
 const orgListCache = /* @__PURE__ */ new Map();
-const fetchOrgList = (deptId) => __async(void 0, null, function* () {
-  if (orgListCache.has(deptId || "")) {
-    return orgListCache.get(deptId || "");
+const fetchData = (url, cacheKey) => __async(void 0, null, function* () {
+  if (cacheKey && orgListCache.has(cacheKey)) {
+    return orgListCache.get(cacheKey);
+  }
+  const res = (yield (0, import_core.useFetch)(url, { method: "GET" })) || [];
+  if (cacheKey) {
+    orgListCache.set(cacheKey, res);
   }
-  const res = (yield (0, import_core.useFetch)(
-    `https://wflow.cgboiler.com/v1/oa/org/tree/cloud?deptId=${deptId}&type=user`,
-    {
-      method: "GET"
-    }
-  )) || [];
-  orgListCache.set(deptId || "", res);
   return res;
 });
-const userList = (0, import_vue.ref)([]);
-const fetchUserList = () => __async(void 0, null, function* () {
-  const res = (yield (0, import_core.useFetch)(`https://wflow.cgboiler.com/v1/oa/org/alluserbycompanyid`, {
-    method: "GET"
-  })) || [];
-  userList.value = res;
+const fetchOrgList = (deptId) => __async(void 0, null, function* () {
+  const url = `https://wflow.cgboiler.com/v1/oa/org/tree/cloud?deptId=${deptId}&type=user`;
+  return fetchData(url, deptId || "");
 });
-fetchUserList();
+const userList = (0, import_vue.ref)([]);
+function initUserList() {
+  return __async(this, null, function* () {
+    userList.value = yield (0, import_core.getUserList)();
+  });
+}
+initUserList();
 const useApi = () => {
   const orgList = (0, import_vue.ref)([]);
   const currentDeptId = (0, import_vue.ref)("1");
@@ -90,13 +90,8 @@ const useApi = () => {
       orgList.value = [];
       return;
     }
-    const res = yield (0, import_core.useFetch)(
-      `https://wflow.cgboiler.com/v1/oa/org/tree/user/search/cloud?userName=${userName}`,
-      {
-        method: "GET"
-      }
-    );
-    orgList.value = res || [];
+    const url = `https://wflow.cgboiler.com/v1/oa/org/tree/user/search/cloud?userName=${userName}`;
+    orgList.value = yield fetchData(url);
   }), 300);
   return {
     userList,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cgboiler/biz-mobile",
-  "version": "1.10.0",
+  "version": "1.12.0",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -44,7 +44,7 @@
   "dependencies": {
     "lodash-es": "^4.17.21",
     "vant": "^4.9.19",
-    "@cgboiler/core": "1.1.0"
+    "@cgboiler/core": "1.2.0"
   },
   "scripts": {
     "dev": "cg-cli dev",