@cgboiler/biz-mobile 1.9.0 → 1.11.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.8.1";
+export const version: "1.10.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.8.1";
+const version = "1.10.0";
 function install(app) {
   const components = [
     OrgPicker,

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

@@ -12,6 +12,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: BooleanConstructor;
         default: boolean;
     };
+    autoFocus: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     'onUpdate:modelValue': {
         type: import("vue").PropType<(val: (string | number)[] | null) => void>;
     };
@@ -31,6 +35,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: BooleanConstructor;
         default: boolean;
     };
+    autoFocus: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     'onUpdate:modelValue': {
         type: import("vue").PropType<(val: (string | number)[] | null) => void>;
     };
@@ -44,5 +52,6 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     modelValue: (string | number)[] | null;
     show: boolean;
     multiple: boolean;
+    autoFocus: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/es/org-picker/OrgPicker.js

@@ -1,6 +1,26 @@
+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 } from "vue";
 import "./_atomic.css";
-import { defineComponent, ref, computed, watch } from "vue";
+import { defineComponent, ref, computed, watch, nextTick } from "vue";
 import { ActionSheet, Search, List, Image, Empty } from "vant";
 import DeptImg from "./components/deptImg";
 import { orgPickerProps } from "./types";
@@ -45,8 +65,8 @@ var stdin_default = defineComponent({
         return;
       }
       if (props.multiple) {
-        const currentValue = props.modelValue ? [...props.modelValue] : [];
-        const index = currentValue.indexOf(item.id);
+        const currentValue = selectedItems.value ? [...selectedItems.value] : [];
+        const index = currentValue.findIndex((s) => s.id === item.id);
         if (index > -1) {
           currentValue.splice(index, 1);
           selectedItems.value = selectedItems.value.filter((selected) => selected.id !== item.id);
@@ -67,6 +87,16 @@ var stdin_default = defineComponent({
     const keyword = ref("");
     const loading = ref(false);
     const finished = ref(true);
+    const searchRef = ref();
+    watch(() => props.show, (newVal) => __async(this, null, function* () {
+      if (newVal && props.autoFocus) {
+        yield nextTick();
+        setTimeout(() => {
+          var _a;
+          (_a = searchRef.value) == null ? void 0 : _a.focus();
+        }, 300);
+      }
+    }));
     watch(keyword, (newKeyword) => {
       if (newKeyword) {
         searchOrgList(newKeyword);
@@ -83,9 +113,9 @@ var stdin_default = defineComponent({
       return [...personnel, ...departments];
     });
     const isSelected = (item) => {
-      if (!props.modelValue)
+      if (!selectedItems.value)
         return false;
-      return props.modelValue.includes(item.id);
+      return selectedItems.value.find((s) => s.id === item.id);
     };
     const onLoad = () => {
       finished.value = true;
@@ -99,6 +129,7 @@ var stdin_default = defineComponent({
       default: () => [_createVNode("div", {
         "class": "org-list"
       }, [_createVNode(Search, {
+        "ref": searchRef,
         "modelValue": keyword.value,
         "onUpdate:modelValue": ($event) => keyword.value = $event,
         "placeholder": "\u641C\u7D22\u4EBA\u5458",

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

@@ -18,6 +18,10 @@ export declare const orgPickerProps: {
         type: BooleanConstructor;
         default: boolean;
     };
+    autoFocus: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     'onUpdate:modelValue': {
         type: PropType<(val: (string | number)[] | null) => void>;
     };

package/es/org-picker/types.js

@@ -11,6 +11,10 @@ const orgPickerProps = {
     type: Boolean,
     default: false
   },
+  autoFocus: {
+    type: Boolean,
+    default: false
+  },
   "onUpdate:modelValue": {
     type: Function
   },

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

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

@@ -12,6 +12,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: BooleanConstructor;
         default: boolean;
     };
+    autoFocus: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     'onUpdate:modelValue': {
         type: import("vue").PropType<(val: (string | number)[] | null) => void>;
     };
@@ -31,6 +35,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: BooleanConstructor;
         default: boolean;
     };
+    autoFocus: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     'onUpdate:modelValue': {
         type: import("vue").PropType<(val: (string | number)[] | null) => void>;
     };
@@ -44,5 +52,6 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     modelValue: (string | number)[] | null;
     show: boolean;
     multiple: boolean;
+    autoFocus: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _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
@@ -77,8 +97,8 @@ var stdin_default = (0, import_vue2.defineComponent)({
         return;
       }
       if (props.multiple) {
-        const currentValue = props.modelValue ? [...props.modelValue] : [];
-        const index = currentValue.indexOf(item.id);
+        const currentValue = selectedItems.value ? [...selectedItems.value] : [];
+        const index = currentValue.findIndex((s) => s.id === item.id);
         if (index > -1) {
           currentValue.splice(index, 1);
           selectedItems.value = selectedItems.value.filter((selected) => selected.id !== item.id);
@@ -99,6 +119,16 @@ var stdin_default = (0, import_vue2.defineComponent)({
     const keyword = (0, import_vue2.ref)("");
     const loading = (0, import_vue2.ref)(false);
     const finished = (0, import_vue2.ref)(true);
+    const searchRef = (0, import_vue2.ref)();
+    (0, import_vue2.watch)(() => props.show, (newVal) => __async(this, null, function* () {
+      if (newVal && props.autoFocus) {
+        yield (0, import_vue2.nextTick)();
+        setTimeout(() => {
+          var _a;
+          (_a = searchRef.value) == null ? void 0 : _a.focus();
+        }, 300);
+      }
+    }));
     (0, import_vue2.watch)(keyword, (newKeyword) => {
       if (newKeyword) {
         searchOrgList(newKeyword);
@@ -115,9 +145,9 @@ var stdin_default = (0, import_vue2.defineComponent)({
       return [...personnel, ...departments];
     });
     const isSelected = (item) => {
-      if (!props.modelValue)
+      if (!selectedItems.value)
         return false;
-      return props.modelValue.includes(item.id);
+      return selectedItems.value.find((s) => s.id === item.id);
     };
     const onLoad = () => {
       finished.value = true;
@@ -131,6 +161,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
       default: () => [(0, import_vue.createVNode)("div", {
         "class": "org-list"
       }, [(0, import_vue.createVNode)(import_vant.Search, {
+        "ref": searchRef,
         "modelValue": keyword.value,
         "onUpdate:modelValue": ($event) => keyword.value = $event,
         "placeholder": "\u641C\u7D22\u4EBA\u5458",

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

@@ -18,6 +18,10 @@ export declare const orgPickerProps: {
         type: BooleanConstructor;
         default: boolean;
     };
+    autoFocus: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     'onUpdate:modelValue': {
         type: PropType<(val: (string | number)[] | null) => void>;
     };

package/lib/org-picker/types.js

@@ -33,6 +33,10 @@ const orgPickerProps = {
     type: Boolean,
     default: false
   },
+  autoFocus: {
+    type: Boolean,
+    default: false
+  },
   "onUpdate:modelValue": {
     type: Function
   },

package/package.json

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