@cgboiler/biz-mobile 1.6.0 → 1.7.1

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.5.0";
+export const version: "1.7.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.5.0";
+const version = "1.7.0";
 function install(app) {
   const components = [
     OrgPicker,

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

@@ -1,8 +1,7 @@
-import { type OrgItem } from './types';
 import './index.less';
 declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     modelValue: {
-        type: import("vue").PropType<OrgItem | OrgItem[] | null>;
+        type: import("vue").PropType<(string | number)[] | null>;
         default: () => null;
     };
     show: {
@@ -14,14 +13,14 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         default: boolean;
     };
     'onUpdate:modelValue': {
-        type: import("vue").PropType<(val: OrgItem | OrgItem[] | null) => void>;
+        type: import("vue").PropType<(val: (string | number)[] | null) => void>;
     };
     'onUpdate:show': {
         type: import("vue").PropType<(val: boolean) => void>;
     };
 }>, () => 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: {
-        type: import("vue").PropType<OrgItem | OrgItem[] | null>;
+        type: import("vue").PropType<(string | number)[] | null>;
         default: () => null;
     };
     show: {
@@ -33,7 +32,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         default: boolean;
     };
     'onUpdate:modelValue': {
-        type: import("vue").PropType<(val: OrgItem | OrgItem[] | null) => void>;
+        type: import("vue").PropType<(val: (string | number)[] | null) => void>;
     };
     'onUpdate:show': {
         type: import("vue").PropType<(val: boolean) => void>;
@@ -42,7 +41,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
     "onUpdate:show"?: ((...args: any[]) => any) | undefined;
 }>, {
-    modelValue: OrgItem | OrgItem[] | null;
+    modelValue: (string | number)[] | null;
     show: boolean;
     multiple: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/es/org-picker/OrgPicker.js

@@ -18,25 +18,46 @@ var stdin_default = defineComponent({
       getOrgList,
       currentDeptId,
       deptPath,
-      searchOrgList
+      searchOrgList,
+      userList
     } = useApi();
     getOrgList();
+    const selectedItems = ref([]);
+    watch(() => props.modelValue, (newValue) => {
+      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);
+    }, {
+      immediate: true
+    });
     const handleSelect = (item) => {
       if (item.type === "dept") {
         getOrgList(item.id);
         return;
       }
       if (props.multiple) {
-        const currentValue = props.modelValue ? [...Array.isArray(props.modelValue) ? props.modelValue : [props.modelValue]] : [];
-        const index = currentValue.findIndex((selected) => selected.id === item.id);
+        const currentValue = props.modelValue ? [...props.modelValue] : [];
+        const index = currentValue.indexOf(item.id);
         if (index > -1) {
           currentValue.splice(index, 1);
+          selectedItems.value = selectedItems.value.filter((selected) => selected.id !== item.id);
         } else {
-          currentValue.push(item);
+          currentValue.push(item.id);
+          selectedItems.value.push(item);
         }
         emit("update:modelValue", currentValue);
       } else {
-        emit("update:modelValue", item);
+        selectedItems.value = [item];
+        emit("update:modelValue", [item.id]);
         emit("update:show", false);
       }
     };
@@ -62,15 +83,9 @@ var stdin_default = defineComponent({
       return [...personnel, ...departments];
     });
     const isSelected = (item) => {
-      var _a;
       if (!props.modelValue)
         return false;
-      if (props.multiple) {
-        const selectedItems = Array.isArray(props.modelValue) ? props.modelValue : [props.modelValue];
-        return selectedItems.some((selected) => selected.id === item.id);
-      } else {
-        return ((_a = props.modelValue) == null ? void 0 : _a.id) === item.id;
-      }
+      return props.modelValue.includes(item.id);
     };
     const onLoad = () => {
       finished.value = true;
@@ -139,9 +154,9 @@ var stdin_default = defineComponent({
         "class": "empty-search-result"
       }, [_createTextVNode("\u672A\u627E\u5230\u76F8\u5173\u4EBA\u5458")])]), props.multiple && _createVNode("div", {
         "class": "bottom-section"
-      }, [Array.isArray(props.modelValue) && props.modelValue.length > 0 && _createVNode("div", {
+      }, [selectedItems.value.length > 0 && _createVNode("div", {
         "class": "selected-items"
-      }, [props.modelValue.map((item) => _createVNode("div", {
+      }, [selectedItems.value.map((item) => _createVNode("div", {
         "key": item.id,
         "class": "selected-tag",
         "onClick": () => handleSelect(item)

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

@@ -7,7 +7,7 @@ export interface OrgItem {
 }
 export declare const orgPickerProps: {
     modelValue: {
-        type: PropType<OrgItem | OrgItem[] | null>;
+        type: PropType<(string | number)[] | null>;
         default: () => null;
     };
     show: {
@@ -19,7 +19,7 @@ export declare const orgPickerProps: {
         default: boolean;
     };
     'onUpdate:modelValue': {
-        type: PropType<(val: OrgItem | OrgItem[] | null) => void>;
+        type: PropType<(val: (string | number)[] | null) => void>;
     };
     'onUpdate:show': {
         type: PropType<(val: boolean) => void>;

package/es/org-picker/types.js

@@ -1,6 +1,6 @@
 const orgPickerProps = {
   modelValue: {
-    type: [Object, Array],
+    type: Array,
     default: () => null
   },
   show: {

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

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

package/es/org-picker/useApi.js

@@ -35,6 +35,14 @@ const fetchOrgList = (deptId) => __async(void 0, null, function* () {
   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;
+});
+fetchUserList();
 const useApi = () => {
   const orgList = ref([]);
   const currentDeptId = ref("1");
@@ -69,6 +77,7 @@ const useApi = () => {
     orgList.value = res || [];
   }), 300);
   return {
+    userList,
     orgList,
     getOrgList,
     currentDeptId,

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.5.0";
+export const version: "1.7.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.5.0";
+const version = "1.7.0";
 function install(app) {
   const components = [
     import_org_picker.default,

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

@@ -1,8 +1,7 @@
-import { type OrgItem } from './types';
 import './index.less';
 declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     modelValue: {
-        type: import("vue").PropType<OrgItem | OrgItem[] | null>;
+        type: import("vue").PropType<(string | number)[] | null>;
         default: () => null;
     };
     show: {
@@ -14,14 +13,14 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         default: boolean;
     };
     'onUpdate:modelValue': {
-        type: import("vue").PropType<(val: OrgItem | OrgItem[] | null) => void>;
+        type: import("vue").PropType<(val: (string | number)[] | null) => void>;
     };
     'onUpdate:show': {
         type: import("vue").PropType<(val: boolean) => void>;
     };
 }>, () => 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: {
-        type: import("vue").PropType<OrgItem | OrgItem[] | null>;
+        type: import("vue").PropType<(string | number)[] | null>;
         default: () => null;
     };
     show: {
@@ -33,7 +32,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         default: boolean;
     };
     'onUpdate:modelValue': {
-        type: import("vue").PropType<(val: OrgItem | OrgItem[] | null) => void>;
+        type: import("vue").PropType<(val: (string | number)[] | null) => void>;
     };
     'onUpdate:show': {
         type: import("vue").PropType<(val: boolean) => void>;
@@ -42,7 +41,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
     "onUpdate:show"?: ((...args: any[]) => any) | undefined;
 }>, {
-    modelValue: OrgItem | OrgItem[] | null;
+    modelValue: (string | number)[] | null;
     show: boolean;
     multiple: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/lib/org-picker/OrgPicker.js

@@ -50,25 +50,46 @@ var stdin_default = (0, import_vue2.defineComponent)({
       getOrgList,
       currentDeptId,
       deptPath,
-      searchOrgList
+      searchOrgList,
+      userList
     } = (0, import_useApi.useApi)();
     getOrgList();
+    const selectedItems = (0, import_vue2.ref)([]);
+    (0, import_vue2.watch)(() => props.modelValue, (newValue) => {
+      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);
+    }, {
+      immediate: true
+    });
     const handleSelect = (item) => {
       if (item.type === "dept") {
         getOrgList(item.id);
         return;
       }
       if (props.multiple) {
-        const currentValue = props.modelValue ? [...Array.isArray(props.modelValue) ? props.modelValue : [props.modelValue]] : [];
-        const index = currentValue.findIndex((selected) => selected.id === item.id);
+        const currentValue = props.modelValue ? [...props.modelValue] : [];
+        const index = currentValue.indexOf(item.id);
         if (index > -1) {
           currentValue.splice(index, 1);
+          selectedItems.value = selectedItems.value.filter((selected) => selected.id !== item.id);
         } else {
-          currentValue.push(item);
+          currentValue.push(item.id);
+          selectedItems.value.push(item);
         }
         emit("update:modelValue", currentValue);
       } else {
-        emit("update:modelValue", item);
+        selectedItems.value = [item];
+        emit("update:modelValue", [item.id]);
         emit("update:show", false);
       }
     };
@@ -94,15 +115,9 @@ var stdin_default = (0, import_vue2.defineComponent)({
       return [...personnel, ...departments];
     });
     const isSelected = (item) => {
-      var _a;
       if (!props.modelValue)
         return false;
-      if (props.multiple) {
-        const selectedItems = Array.isArray(props.modelValue) ? props.modelValue : [props.modelValue];
-        return selectedItems.some((selected) => selected.id === item.id);
-      } else {
-        return ((_a = props.modelValue) == null ? void 0 : _a.id) === item.id;
-      }
+      return props.modelValue.includes(item.id);
     };
     const onLoad = () => {
       finished.value = true;
@@ -171,9 +186,9 @@ var stdin_default = (0, import_vue2.defineComponent)({
         "class": "empty-search-result"
       }, [(0, import_vue.createTextVNode)("\u672A\u627E\u5230\u76F8\u5173\u4EBA\u5458")])]), props.multiple && (0, import_vue.createVNode)("div", {
         "class": "bottom-section"
-      }, [Array.isArray(props.modelValue) && props.modelValue.length > 0 && (0, import_vue.createVNode)("div", {
+      }, [selectedItems.value.length > 0 && (0, import_vue.createVNode)("div", {
         "class": "selected-items"
-      }, [props.modelValue.map((item) => (0, import_vue.createVNode)("div", {
+      }, [selectedItems.value.map((item) => (0, import_vue.createVNode)("div", {
         "key": item.id,
         "class": "selected-tag",
         "onClick": () => handleSelect(item)

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

@@ -7,7 +7,7 @@ export interface OrgItem {
 }
 export declare const orgPickerProps: {
     modelValue: {
-        type: PropType<OrgItem | OrgItem[] | null>;
+        type: PropType<(string | number)[] | null>;
         default: () => null;
     };
     show: {
@@ -19,7 +19,7 @@ export declare const orgPickerProps: {
         default: boolean;
     };
     'onUpdate:modelValue': {
-        type: PropType<(val: OrgItem | OrgItem[] | null) => void>;
+        type: PropType<(val: (string | number)[] | null) => void>;
     };
     'onUpdate:show': {
         type: PropType<(val: boolean) => void>;

package/lib/org-picker/types.js

@@ -22,7 +22,7 @@ __export(stdin_exports, {
 module.exports = __toCommonJS(stdin_exports);
 const orgPickerProps = {
   modelValue: {
-    type: [Object, Array],
+    type: Array,
     default: () => null
   },
   show: {

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

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

package/lib/org-picker/useApi.js

@@ -57,6 +57,14 @@ const fetchOrgList = (deptId) => __async(void 0, null, function* () {
   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;
+});
+fetchUserList();
 const useApi = () => {
   const orgList = (0, import_vue.ref)([]);
   const currentDeptId = (0, import_vue.ref)("1");
@@ -91,6 +99,7 @@ const useApi = () => {
     orgList.value = res || [];
   }), 300);
   return {
+    userList,
     orgList,
     getOrgList,
     currentDeptId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cgboiler/biz-mobile",
-  "version": "1.6.0",
+  "version": "1.7.1",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",