@cgboiler/biz-mobile 1.18.0 → 1.18.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (23) hide show
  1. package/es/index.d.ts +1 -1
  2. package/es/index.js +1 -1
  3. package/es/org-picker/OrgPicker.d.ts +3 -3
  4. package/es/org-picker/OrgPicker.js +5 -2
  5. package/es/org-picker/types.d.ts +2 -2
  6. package/es/org-picker/useApi.d.ts +7 -7
  7. package/es/org-picker/useApi.js +16 -9
  8. package/es/org-picker/useSearch.d.ts +1 -1
  9. package/es/org-picker/useSearch.js +8 -2
  10. package/es/rich-text-editor/index.css +0 -1
  11. package/es/rich-text-editor/index.less +0 -191
  12. package/lib/index.d.ts +1 -1
  13. package/lib/index.js +1 -1
  14. package/lib/org-picker/OrgPicker.d.ts +3 -3
  15. package/lib/org-picker/OrgPicker.js +5 -2
  16. package/lib/org-picker/types.d.ts +2 -2
  17. package/lib/org-picker/useApi.d.ts +7 -7
  18. package/lib/org-picker/useApi.js +15 -8
  19. package/lib/org-picker/useSearch.d.ts +1 -1
  20. package/lib/org-picker/useSearch.js +8 -2
  21. package/lib/rich-text-editor/index.css +0 -1
  22. package/lib/rich-text-editor/index.less +0 -191
  23. package/package.json +3 -3
package/es/index.d.ts CHANGED
@@ -8,7 +8,7 @@ declare namespace _default {
8
8
  }
9
9
  export default _default;
10
10
  export function install(app: any): void;
11
- export const version: "1.17.18";
11
+ export const version: "1.18.1";
12
12
  import MdPreview from './md-preview';
13
13
  import OrgPicker from './org-picker';
14
14
  import ProjectSelect from './project-select';
package/es/index.js CHANGED
@@ -2,7 +2,7 @@ import MdPreview from "./md-preview";
2
2
  import OrgPicker from "./org-picker";
3
3
  import ProjectSelect from "./project-select";
4
4
  import RichTextEditor from "./rich-text-editor";
5
- const version = "1.17.18";
5
+ const version = "1.18.1";
6
6
  function install(app) {
7
7
  const components = [
8
8
  MdPreview,
package/es/org-picker/OrgPicker.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import './index.less';
2
2
  declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
3
3
  modelValue: {
4
- type: import("vue").PropType<(string | number)[] | null>;
4
+ type: import("vue").PropType<(string)[] | null>;
5
5
  default: () => null;
6
6
  };
7
7
  show: {
@@ -24,7 +24,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
24
24
  };
25
25
  }>, () => 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<{
26
26
  modelValue: {
27
- type: import("vue").PropType<(string | number)[] | null>;
27
+ type: import("vue").PropType<(string)[] | null>;
28
28
  default: () => null;
29
29
  };
30
30
  show: {
@@ -49,7 +49,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
49
49
  "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
50
50
  "onUpdate:show"?: ((...args: any[]) => any) | undefined;
51
51
  }>, {
52
- modelValue: (string | number)[] | null;
52
+ modelValue: string[] | null;
53
53
  show: boolean;
54
54
  multiple: boolean;
55
55
  autoFocus: boolean;
package/es/org-picker/OrgPicker.js CHANGED
@@ -83,7 +83,7 @@ var stdin_default = defineComponent({
83
83
  }
84
84
  };
85
85
  const handleHistorySelect = (item) => {
86
- selectedItems.value = item.selectedUsers;
86
+ selectedItems.value = item.selectedUsers.map((user) => getUserInfoById(user.id));
87
87
  };
88
88
  const handleConfirm = () => {
89
89
  emit("update:show", false);
@@ -151,7 +151,10 @@ var stdin_default = defineComponent({
151
151
  "class": "py-8px border-b border-[#eee] flex items-center"
152
152
  }, [_createVNode("span", {
153
153
  "class": "flex-1"
154
- }, [historyItem.selectedUsers.map((user) => highlightText(getUserInfoById(user.id), keyword.value)).reduce((prev, curr) => [prev, "\uFF0C", curr])]), _createVNode("span", {
154
+ }, [historyItem.selectedUsers.map((user) => {
155
+ var _a;
156
+ return highlightText((_a = getUserInfoById(user.id)) == null ? void 0 : _a.name, keyword.value);
157
+ }).reduce((prev, curr) => [prev, "\uFF0C", curr])]), _createVNode("span", {
155
158
  "class": "p-4px pl-2",
156
159
  "onClick": (e) => {
157
160
  e.stopPropagation();
package/es/org-picker/types.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { ExtractPropTypes, PropType } from 'vue';
2
2
  export interface OrgItem {
3
- id: string | number;
3
+ id: string;
4
4
  name: string;
5
5
  type: string;
6
6
  avatar?: string;
@@ -8,7 +8,7 @@ export interface OrgItem {
8
8
  }
9
9
  export declare const orgPickerProps: {
10
10
  modelValue: {
11
- type: PropType<(string | number)[] | null>;
11
+ type: PropType<(string)[] | null>;
12
12
  default: () => null;
13
13
  };
14
14
  show: {
package/es/org-picker/useApi.d.ts CHANGED
@@ -2,39 +2,39 @@ import { type OrgItem, RecentSelection } from './types';
2
2
  export declare const useApi: () => {
3
3
  userList: import("vue").Ref<{
4
4
  [x: string]: any;
5
- id: string | number;
5
+ id: string;
6
6
  name: string;
7
7
  type: string;
8
8
  avatar?: string | undefined;
9
9
  }[], OrgItem[] | {
10
10
  [x: string]: any;
11
- id: string | number;
11
+ id: string;
12
12
  name: string;
13
13
  type: string;
14
14
  avatar?: string | undefined;
15
15
  }[]>;
16
16
  orgList: import("vue").Ref<{
17
17
  [x: string]: any;
18
- id: string | number;
18
+ id: string;
19
19
  name: string;
20
20
  type: string;
21
21
  avatar?: string | undefined;
22
22
  }[], OrgItem[] | {
23
23
  [x: string]: any;
24
- id: string | number;
24
+ id: string;
25
25
  name: string;
26
26
  type: string;
27
27
  avatar?: string | undefined;
28
28
  }[]>;
29
29
  orgSearchList: import("vue").Ref<{
30
30
  [x: string]: any;
31
- id: string | number;
31
+ id: string;
32
32
  name: string;
33
33
  type: string;
34
34
  avatar?: string | undefined;
35
35
  }[], OrgItem[] | {
36
36
  [x: string]: any;
37
- id: string | number;
37
+ id: string;
38
38
  name: string;
39
39
  type: string;
40
40
  avatar?: string | undefined;
@@ -55,5 +55,5 @@ export declare const useApi: () => {
55
55
  searchOrgList: import("lodash-es").DebouncedFunc<(userName: string) => Promise<void>>;
56
56
  getRecentSelectedUsers: () => Promise<RecentSelection[]>;
57
57
  setRecentSelectedUsers: (users: OrgItem[]) => Promise<void>;
58
- getUserInfoById: (id: string | number) => string;
58
+ getUserInfoById: (id: string | number) => OrgItem | undefined;
59
59
  };
package/es/org-picker/useApi.js CHANGED
@@ -18,7 +18,7 @@ var __async = (__this, __arguments, generator) => {
18
18
  step((generator = generator.apply(__this, __arguments)).next());
19
19
  });
20
20
  };
21
- import { ref } from "vue";
21
+ import { computed, ref } from "vue";
22
22
  import { useFetch, getUserList, getStorage, getUserInfo, removeStorage } from "@cgboiler/core";
23
23
  import { debounce } from "lodash-es";
24
24
  const orgListCache = /* @__PURE__ */ new Map();
@@ -37,6 +37,13 @@ const fetchOrgList = (deptId) => __async(void 0, null, function* () {
37
37
  return fetchData(url, deptId || "");
38
38
  });
39
39
  const userList = ref([]);
40
+ const userMap = computed(() => {
41
+ const map = /* @__PURE__ */ new Map();
42
+ userList.value.forEach((item) => {
43
+ map.set(item.id, item);
44
+ });
45
+ return map;
46
+ });
40
47
  function initUserList() {
41
48
  return __async(this, null, function* () {
42
49
  userList.value = yield getUserList();
@@ -64,7 +71,13 @@ const useApi = () => {
64
71
  }
65
72
  }
66
73
  const list = yield fetchOrgList(currentDeptId.value);
67
- orgList.value = list || [];
74
+ orgList.value = list.filter((item) => {
75
+ var _a;
76
+ if (item.type === "user") {
77
+ return ((_a = userMap.value.get(item.id)) == null ? void 0 : _a.status) !== 5;
78
+ }
79
+ return true;
80
+ }) || [];
68
81
  });
69
82
  const searchOrgList = debounce((userName) => __async(void 0, null, function* () {
70
83
  if (!userName) {
@@ -226,13 +239,7 @@ const useApi = () => {
226
239
  }
227
240
  });
228
241
  const getUserInfoById = (id) => {
229
- let name = "";
230
- userList.value.forEach((item) => {
231
- if (item.id === id) {
232
- name = item.name;
233
- }
234
- });
235
- return name;
242
+ return userList.value.find((item) => item.id === id);
236
243
  };
237
244
  return {
238
245
  userList,
package/es/org-picker/useSearch.d.ts CHANGED
@@ -7,5 +7,5 @@ export declare function useSearch({ props, api, isSearchFocus }: any): {
7
7
  filteredOrgList: import("vue").ComputedRef<any>;
8
8
  recentSelectedHistory: import("vue").Ref<any[], any[]>;
9
9
  filterRecentSelectedHistory: import("vue").Ref<any[], any[]>;
10
- highlightText: (text: string | number, keyword: string) => string | number | (string | import("vue/jsx-runtime").JSX.Element)[];
10
+ highlightText: (text: any, keyword: string) => any;
11
11
  };
package/es/org-picker/useSearch.js CHANGED
@@ -55,7 +55,10 @@ function useSearch({
55
55
  });
56
56
  watchEffect(() => {
57
57
  if (keyword.value) {
58
- filterRecentSelectedHistory.value = recentSelectedHistory.value.filter((item) => item.selectedUsers.some((user) => keyword.value.split("").some((char) => getUserInfoById(user.id).includes(char))));
58
+ filterRecentSelectedHistory.value = recentSelectedHistory.value.filter((item) => item.selectedUsers.some((user) => keyword.value.split("").some((char) => {
59
+ var _a;
60
+ return (_a = getUserInfoById(user.id)) == null ? void 0 : _a.name.includes(char);
61
+ })));
59
62
  } else {
60
63
  filterRecentSelectedHistory.value = recentSelectedHistory.value;
61
64
  }
@@ -106,7 +109,10 @@ function useSearch({
106
109
  "key": historyItem.id,
107
110
  "onClick": () => handleHistorySelect(historyItem),
108
111
  "class": "px-16px py-8px border-b border-[#eee]"
109
- }, [_createVNode("span", null, [historyItem.selectedUsers.map((user) => highlightText(getUserInfoById(user.id), keyword.value)).reduce((prev, curr) => [prev, "\uFF0C", curr])])]))])]) : "", filteredOrgList.value.length ? _createVNode(_Fragment, null, [" ", _createVNode("p", {
112
+ }, [_createVNode("span", null, [historyItem.selectedUsers.map((user) => {
113
+ var _a;
114
+ return highlightText((_a = getUserInfoById(user.id)) == null ? void 0 : _a.name, keyword.value);
115
+ }).reduce((prev, curr) => [prev, "\uFF0C", curr])])]))])]) : "", filteredOrgList.value.length ? _createVNode(_Fragment, null, [" ", _createVNode("p", {
110
116
  "class": "text-[14px] text-[#333] font-bold px-[16px] py-[12px] border-b border-[#eee]"
111
117
  }, [_createTextVNode("\u901A\u8BAF\u5F55")]), _createVNode("div", {
112
118
  "class": "px-16px"
package/es/rich-text-editor/index.css CHANGED
@@ -1 +0,0 @@
1
- .ProseMirror{flex:1;overflow:auto;outline:none;line-height:1.6;font-size:var(--font-base);--white: #fff;--black: #2e2b29;--black-contrast: #110f0e;--gray-1: rgba(61, 37, 20, .05);--gray-2: rgba(61, 37, 20, .08);--gray-3: rgba(61, 37, 20, .12);--gray-4: rgba(53, 38, 28, .3);--gray-5: rgba(28, 25, 23, .6);--green: #22c55e;--purple: #6a00f5;--purple-contrast: #5800cc;--purple-light: rgba(88, 5, 255, .05);--yellow-contrast: #facc15;--yellow: rgba(250, 204, 21, .4);--yellow-light: #fffae5;--red: #ff5c33;--red-light: #ffebe5;--shadow: 0px 12px 33px 0px rgba(0, 0, 0, .06), 0px 3.618px 9.949px 0px rgba(0, 0, 0, .04)}.ProseMirror :first-child{margin-top:0}.ProseMirror ul,.ProseMirror ol{padding:0 1rem;margin:1.25rem 1rem 1.25rem .4rem}.ProseMirror ul li p,.ProseMirror ol li p{margin-top:.25em;margin-bottom:.25em}.ProseMirror h1,.ProseMirror h2,.ProseMirror h3,.ProseMirror h4,.ProseMirror h5,.ProseMirror h6{line-height:1.1;margin-top:2.5rem;text-wrap:pretty}.ProseMirror h1,.ProseMirror h2{margin-top:3.5rem;margin-bottom:1.5rem}.ProseMirror h1{font-size:1.4rem}.ProseMirror h2{font-size:1.2rem}.ProseMirror h3{font-size:1.1rem}.ProseMirror h4,.ProseMirror h5,.ProseMirror h6{font-size:1rem}.ProseMirror code{background-color:var(--purple-light);border-radius:.4rem;color:var(--black);font-size:.85rem;padding:.25em .3em}.ProseMirror pre{background:var(--black);border-radius:.5rem;color:var(--white);font-family:JetBrainsMono,monospace;margin:1.5rem 0;padding:.75rem 1rem}.ProseMirror pre code{background:none;color:inherit;font-size:.8rem;padding:0}.ProseMirror blockquote{border-left:3px solid var(--gray-3);margin:1.5rem 0;padding-left:1rem}.ProseMirror hr{border:none;border-top:1px solid var(--gray-2);margin:2rem 0}.ProseMirror p.is-editor-empty:first-child:before{color:var(--gray-4);content:attr(data-placeholder);float:left;height:0;pointer-events:none}.ProseMirror .is-empty:before{color:var(--gray-4);content:attr(data-placeholder);float:left;height:0;pointer-events:none}.ProseMirror table{border-collapse:collapse;margin:0;overflow:hidden;table-layout:fixed;width:100%}.ProseMirror table td,.ProseMirror table th{border:1px solid var(--gray-3);box-sizing:border-box;min-width:1em;padding:6px 8px;position:relative;vertical-align:top}.ProseMirror table td>*,.ProseMirror table th>*{margin-bottom:0}.ProseMirror table th{background-color:var(--gray-1);font-weight:700;text-align:left}.ProseMirror table .selectedCell:after{background:var(--gray-2);content:"";left:0;right:0;top:0;bottom:0;pointer-events:none;position:absolute;z-index:2}.ProseMirror table .column-resize-handle{background-color:var(--purple);bottom:-2px;pointer-events:none;position:absolute;right:-2px;top:0;width:4px}.ProseMirror .tableWrapper{margin:1.5rem 0;overflow-x:auto}.ProseMirror.resize-cursor{cursor:ew-resize;cursor:col-resize}
package/es/rich-text-editor/index.less CHANGED
@@ -1,191 +0,0 @@
1
- .ProseMirror {
2
- flex: 1;
3
- overflow: auto;
4
- outline: none;
5
-
6
- line-height: 1.6;
7
- font-size: var(--font-base);
8
- --white: #fff;
9
- --black: #2e2b29;
10
- --black-contrast: #110f0e;
11
- --gray-1: rgba(61, 37, 20, 0.05);
12
- --gray-2: rgba(61, 37, 20, 0.08);
13
- --gray-3: rgba(61, 37, 20, 0.12);
14
- --gray-4: rgba(53, 38, 28, 0.3);
15
- --gray-5: rgba(28, 25, 23, 0.6);
16
- --green: #22c55e;
17
- --purple: #6a00f5;
18
- --purple-contrast: #5800cc;
19
- --purple-light: rgba(88, 5, 255, 0.05);
20
- --yellow-contrast: #facc15;
21
- --yellow: rgba(250, 204, 21, 0.4);
22
- --yellow-light: #fffae5;
23
- --red: #ff5c33;
24
- --red-light: #ffebe5;
25
- --shadow: 0px 12px 33px 0px rgba(0, 0, 0, 0.06), 0px 3.618px 9.949px 0px rgba(0, 0, 0, 0.04);
26
- :first-child {
27
- margin-top: 0;
28
- }
29
-
30
- /* List styles */
31
- ul,
32
- ol {
33
- padding: 0 1rem;
34
- margin: 1.25rem 1rem 1.25rem 0.4rem;
35
-
36
- li p {
37
- margin-top: 0.25em;
38
- margin-bottom: 0.25em;
39
- }
40
- }
41
-
42
- /* Heading styles */
43
- h1,
44
- h2,
45
- h3,
46
- h4,
47
- h5,
48
- h6 {
49
- line-height: 1.1;
50
- margin-top: 2.5rem;
51
- text-wrap: pretty;
52
- }
53
-
54
- h1,
55
- h2 {
56
- margin-top: 3.5rem;
57
- margin-bottom: 1.5rem;
58
- }
59
-
60
- h1 {
61
- font-size: 1.4rem;
62
- }
63
-
64
- h2 {
65
- font-size: 1.2rem;
66
- }
67
-
68
- h3 {
69
- font-size: 1.1rem;
70
- }
71
-
72
- h4,
73
- h5,
74
- h6 {
75
- font-size: 1rem;
76
- }
77
-
78
- /* Code and preformatted text styles */
79
- code {
80
- background-color: var(--purple-light);
81
- border-radius: 0.4rem;
82
- color: var(--black);
83
- font-size: 0.85rem;
84
- padding: 0.25em 0.3em;
85
- }
86
-
87
- pre {
88
- background: var(--black);
89
- border-radius: 0.5rem;
90
- color: var(--white);
91
- font-family: 'JetBrainsMono', monospace;
92
- margin: 1.5rem 0;
93
- padding: 0.75rem 1rem;
94
-
95
- code {
96
- background: none;
97
- color: inherit;
98
- font-size: 0.8rem;
99
- padding: 0;
100
- }
101
- }
102
-
103
- blockquote {
104
- border-left: 3px solid var(--gray-3);
105
- margin: 1.5rem 0;
106
- padding-left: 1rem;
107
- }
108
-
109
- hr {
110
- border: none;
111
- border-top: 1px solid var(--gray-2);
112
- margin: 2rem 0;
113
- }
114
-
115
- /* Placeholder (at the top) */
116
- p.is-editor-empty:first-child::before {
117
- color: var(--gray-4);
118
- content: attr(data-placeholder);
119
- float: left;
120
- height: 0;
121
- pointer-events: none;
122
- }
123
-
124
- .is-empty::before {
125
- color: var(--gray-4);
126
- content: attr(data-placeholder);
127
- float: left;
128
- height: 0;
129
- pointer-events: none;
130
- }
131
- /* Table-specific styling */
132
- table {
133
- border-collapse: collapse;
134
- margin: 0;
135
- overflow: hidden;
136
- table-layout: fixed;
137
- width: 100%;
138
-
139
- td,
140
- th {
141
- border: 1px solid var(--gray-3);
142
- box-sizing: border-box;
143
- min-width: 1em;
144
- padding: 6px 8px;
145
- position: relative;
146
- vertical-align: top;
147
-
148
- > * {
149
- margin-bottom: 0;
150
- }
151
- }
152
-
153
- th {
154
- background-color: var(--gray-1);
155
- font-weight: bold;
156
- text-align: left;
157
- }
158
-
159
- .selectedCell:after {
160
- background: var(--gray-2);
161
- content: '';
162
- left: 0;
163
- right: 0;
164
- top: 0;
165
- bottom: 0;
166
- pointer-events: none;
167
- position: absolute;
168
- z-index: 2;
169
- }
170
-
171
- .column-resize-handle {
172
- background-color: var(--purple);
173
- bottom: -2px;
174
- pointer-events: none;
175
- position: absolute;
176
- right: -2px;
177
- top: 0;
178
- width: 4px;
179
- }
180
- }
181
-
182
- .tableWrapper {
183
- margin: 1.5rem 0;
184
- overflow-x: auto;
185
- }
186
-
187
- &.resize-cursor {
188
- cursor: ew-resize;
189
- cursor: col-resize;
190
- }
191
- }
package/lib/index.d.ts CHANGED
@@ -8,7 +8,7 @@ declare namespace _default {
8
8
  }
9
9
  export default _default;
10
10
  export function install(app: any): void;
11
- export const version: "1.17.18";
11
+ export const version: "1.18.1";
12
12
  import MdPreview from './md-preview';
13
13
  import OrgPicker from './org-picker';
14
14
  import ProjectSelect from './project-select';
package/lib/index.js CHANGED
@@ -45,7 +45,7 @@ __reExport(stdin_exports, require("./md-preview"), module.exports);
45
45
  __reExport(stdin_exports, require("./org-picker"), module.exports);
46
46
  __reExport(stdin_exports, require("./project-select"), module.exports);
47
47
  __reExport(stdin_exports, require("./rich-text-editor"), module.exports);
48
- const version = "1.17.18";
48
+ const version = "1.18.1";
49
49
  function install(app) {
50
50
  const components = [
51
51
  import_md_preview.default,
package/lib/org-picker/OrgPicker.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import './index.less';
2
2
  declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
3
3
  modelValue: {
4
- type: import("vue").PropType<(string | number)[] | null>;
4
+ type: import("vue").PropType<(string)[] | null>;
5
5
  default: () => null;
6
6
  };
7
7
  show: {
@@ -24,7 +24,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
24
24
  };
25
25
  }>, () => 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<{
26
26
  modelValue: {
27
- type: import("vue").PropType<(string | number)[] | null>;
27
+ type: import("vue").PropType<(string)[] | null>;
28
28
  default: () => null;
29
29
  };
30
30
  show: {
@@ -49,7 +49,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
49
49
  "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
50
50
  "onUpdate:show"?: ((...args: any[]) => any) | undefined;
51
51
  }>, {
52
- modelValue: (string | number)[] | null;
52
+ modelValue: string[] | null;
53
53
  show: boolean;
54
54
  multiple: boolean;
55
55
  autoFocus: boolean;
package/lib/org-picker/OrgPicker.js CHANGED
@@ -115,7 +115,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
115
115
  }
116
116
  };
117
117
  const handleHistorySelect = (item) => {
118
- selectedItems.value = item.selectedUsers;
118
+ selectedItems.value = item.selectedUsers.map((user) => getUserInfoById(user.id));
119
119
  };
120
120
  const handleConfirm = () => {
121
121
  emit("update:show", false);
@@ -183,7 +183,10 @@ var stdin_default = (0, import_vue2.defineComponent)({
183
183
  "class": "py-8px border-b border-[#eee] flex items-center"
184
184
  }, [(0, import_vue.createVNode)("span", {
185
185
  "class": "flex-1"
186
- }, [historyItem.selectedUsers.map((user) => highlightText(getUserInfoById(user.id), keyword.value)).reduce((prev, curr) => [prev, "\uFF0C", curr])]), (0, import_vue.createVNode)("span", {
186
+ }, [historyItem.selectedUsers.map((user) => {
187
+ var _a;
188
+ return highlightText((_a = getUserInfoById(user.id)) == null ? void 0 : _a.name, keyword.value);
189
+ }).reduce((prev, curr) => [prev, "\uFF0C", curr])]), (0, import_vue.createVNode)("span", {
187
190
  "class": "p-4px pl-2",
188
191
  "onClick": (e) => {
189
192
  e.stopPropagation();
package/lib/org-picker/types.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { ExtractPropTypes, PropType } from 'vue';
2
2
  export interface OrgItem {
3
- id: string | number;
3
+ id: string;
4
4
  name: string;
5
5
  type: string;
6
6
  avatar?: string;
@@ -8,7 +8,7 @@ export interface OrgItem {
8
8
  }
9
9
  export declare const orgPickerProps: {
10
10
  modelValue: {
11
- type: PropType<(string | number)[] | null>;
11
+ type: PropType<(string)[] | null>;
12
12
  default: () => null;
13
13
  };
14
14
  show: {
package/lib/org-picker/useApi.d.ts CHANGED
@@ -2,39 +2,39 @@ import { type OrgItem, RecentSelection } from './types';
2
2
  export declare const useApi: () => {
3
3
  userList: import("vue").Ref<{
4
4
  [x: string]: any;
5
- id: string | number;
5
+ id: string;
6
6
  name: string;
7
7
  type: string;
8
8
  avatar?: string | undefined;
9
9
  }[], OrgItem[] | {
10
10
  [x: string]: any;
11
- id: string | number;
11
+ id: string;
12
12
  name: string;
13
13
  type: string;
14
14
  avatar?: string | undefined;
15
15
  }[]>;
16
16
  orgList: import("vue").Ref<{
17
17
  [x: string]: any;
18
- id: string | number;
18
+ id: string;
19
19
  name: string;
20
20
  type: string;
21
21
  avatar?: string | undefined;
22
22
  }[], OrgItem[] | {
23
23
  [x: string]: any;
24
- id: string | number;
24
+ id: string;
25
25
  name: string;
26
26
  type: string;
27
27
  avatar?: string | undefined;
28
28
  }[]>;
29
29
  orgSearchList: import("vue").Ref<{
30
30
  [x: string]: any;
31
- id: string | number;
31
+ id: string;
32
32
  name: string;
33
33
  type: string;
34
34
  avatar?: string | undefined;
35
35
  }[], OrgItem[] | {
36
36
  [x: string]: any;
37
- id: string | number;
37
+ id: string;
38
38
  name: string;
39
39
  type: string;
40
40
  avatar?: string | undefined;
@@ -55,5 +55,5 @@ export declare const useApi: () => {
55
55
  searchOrgList: import("lodash-es").DebouncedFunc<(userName: string) => Promise<void>>;
56
56
  getRecentSelectedUsers: () => Promise<RecentSelection[]>;
57
57
  setRecentSelectedUsers: (users: OrgItem[]) => Promise<void>;
58
- getUserInfoById: (id: string | number) => string;
58
+ getUserInfoById: (id: string | number) => OrgItem | undefined;
59
59
  };
package/lib/org-picker/useApi.js CHANGED
@@ -59,6 +59,13 @@ const fetchOrgList = (deptId) => __async(void 0, null, function* () {
59
59
  return fetchData(url, deptId || "");
60
60
  });
61
61
  const userList = (0, import_vue.ref)([]);
62
+ const userMap = (0, import_vue.computed)(() => {
63
+ const map = /* @__PURE__ */ new Map();
64
+ userList.value.forEach((item) => {
65
+ map.set(item.id, item);
66
+ });
67
+ return map;
68
+ });
62
69
  function initUserList() {
63
70
  return __async(this, null, function* () {
64
71
  userList.value = yield (0, import_core.getUserList)();
@@ -86,7 +93,13 @@ const useApi = () => {
86
93
  }
87
94
  }
88
95
  const list = yield fetchOrgList(currentDeptId.value);
89
- orgList.value = list || [];
96
+ orgList.value = list.filter((item) => {
97
+ var _a;
98
+ if (item.type === "user") {
99
+ return ((_a = userMap.value.get(item.id)) == null ? void 0 : _a.status) !== 5;
100
+ }
101
+ return true;
102
+ }) || [];
90
103
  });
91
104
  const searchOrgList = (0, import_lodash_es.debounce)((userName) => __async(void 0, null, function* () {
92
105
  if (!userName) {
@@ -248,13 +261,7 @@ const useApi = () => {
248
261
  }
249
262
  });
250
263
  const getUserInfoById = (id) => {
251
- let name = "";
252
- userList.value.forEach((item) => {
253
- if (item.id === id) {
254
- name = item.name;
255
- }
256
- });
257
- return name;
264
+ return userList.value.find((item) => item.id === id);
258
265
  };
259
266
  return {
260
267
  userList,
package/lib/org-picker/useSearch.d.ts CHANGED
@@ -7,5 +7,5 @@ export declare function useSearch({ props, api, isSearchFocus }: any): {
7
7
  filteredOrgList: import("vue").ComputedRef<any>;
8
8
  recentSelectedHistory: import("vue").Ref<any[], any[]>;
9
9
  filterRecentSelectedHistory: import("vue").Ref<any[], any[]>;
10
- highlightText: (text: string | number, keyword: string) => string | number | (string | import("vue/jsx-runtime").JSX.Element)[];
10
+ highlightText: (text: any, keyword: string) => any;
11
11
  };
package/lib/org-picker/useSearch.js CHANGED
@@ -77,7 +77,10 @@ function useSearch({
77
77
  });
78
78
  (0, import_vue2.watchEffect)(() => {
79
79
  if (keyword.value) {
80
- filterRecentSelectedHistory.value = recentSelectedHistory.value.filter((item) => item.selectedUsers.some((user) => keyword.value.split("").some((char) => getUserInfoById(user.id).includes(char))));
80
+ filterRecentSelectedHistory.value = recentSelectedHistory.value.filter((item) => item.selectedUsers.some((user) => keyword.value.split("").some((char) => {
81
+ var _a;
82
+ return (_a = getUserInfoById(user.id)) == null ? void 0 : _a.name.includes(char);
83
+ })));
81
84
  } else {
82
85
  filterRecentSelectedHistory.value = recentSelectedHistory.value;
83
86
  }
@@ -128,7 +131,10 @@ function useSearch({
128
131
  "key": historyItem.id,
129
132
  "onClick": () => handleHistorySelect(historyItem),
130
133
  "class": "px-16px py-8px border-b border-[#eee]"
131
- }, [(0, import_vue.createVNode)("span", null, [historyItem.selectedUsers.map((user) => highlightText(getUserInfoById(user.id), keyword.value)).reduce((prev, curr) => [prev, "\uFF0C", curr])])]))])]) : "", filteredOrgList.value.length ? (0, import_vue.createVNode)(import_vue.Fragment, null, [" ", (0, import_vue.createVNode)("p", {
134
+ }, [(0, import_vue.createVNode)("span", null, [historyItem.selectedUsers.map((user) => {
135
+ var _a;
136
+ return highlightText((_a = getUserInfoById(user.id)) == null ? void 0 : _a.name, keyword.value);
137
+ }).reduce((prev, curr) => [prev, "\uFF0C", curr])])]))])]) : "", filteredOrgList.value.length ? (0, import_vue.createVNode)(import_vue.Fragment, null, [" ", (0, import_vue.createVNode)("p", {
132
138
  "class": "text-[14px] text-[#333] font-bold px-[16px] py-[12px] border-b border-[#eee]"
133
139
  }, [(0, import_vue.createTextVNode)("\u901A\u8BAF\u5F55")]), (0, import_vue.createVNode)("div", {
134
140
  "class": "px-16px"
package/lib/rich-text-editor/index.css CHANGED
@@ -1 +0,0 @@
1
- .ProseMirror{flex:1;overflow:auto;outline:none;line-height:1.6;font-size:var(--font-base);--white: #fff;--black: #2e2b29;--black-contrast: #110f0e;--gray-1: rgba(61, 37, 20, .05);--gray-2: rgba(61, 37, 20, .08);--gray-3: rgba(61, 37, 20, .12);--gray-4: rgba(53, 38, 28, .3);--gray-5: rgba(28, 25, 23, .6);--green: #22c55e;--purple: #6a00f5;--purple-contrast: #5800cc;--purple-light: rgba(88, 5, 255, .05);--yellow-contrast: #facc15;--yellow: rgba(250, 204, 21, .4);--yellow-light: #fffae5;--red: #ff5c33;--red-light: #ffebe5;--shadow: 0px 12px 33px 0px rgba(0, 0, 0, .06), 0px 3.618px 9.949px 0px rgba(0, 0, 0, .04)}.ProseMirror :first-child{margin-top:0}.ProseMirror ul,.ProseMirror ol{padding:0 1rem;margin:1.25rem 1rem 1.25rem .4rem}.ProseMirror ul li p,.ProseMirror ol li p{margin-top:.25em;margin-bottom:.25em}.ProseMirror h1,.ProseMirror h2,.ProseMirror h3,.ProseMirror h4,.ProseMirror h5,.ProseMirror h6{line-height:1.1;margin-top:2.5rem;text-wrap:pretty}.ProseMirror h1,.ProseMirror h2{margin-top:3.5rem;margin-bottom:1.5rem}.ProseMirror h1{font-size:1.4rem}.ProseMirror h2{font-size:1.2rem}.ProseMirror h3{font-size:1.1rem}.ProseMirror h4,.ProseMirror h5,.ProseMirror h6{font-size:1rem}.ProseMirror code{background-color:var(--purple-light);border-radius:.4rem;color:var(--black);font-size:.85rem;padding:.25em .3em}.ProseMirror pre{background:var(--black);border-radius:.5rem;color:var(--white);font-family:JetBrainsMono,monospace;margin:1.5rem 0;padding:.75rem 1rem}.ProseMirror pre code{background:none;color:inherit;font-size:.8rem;padding:0}.ProseMirror blockquote{border-left:3px solid var(--gray-3);margin:1.5rem 0;padding-left:1rem}.ProseMirror hr{border:none;border-top:1px solid var(--gray-2);margin:2rem 0}.ProseMirror p.is-editor-empty:first-child:before{color:var(--gray-4);content:attr(data-placeholder);float:left;height:0;pointer-events:none}.ProseMirror .is-empty:before{color:var(--gray-4);content:attr(data-placeholder);float:left;height:0;pointer-events:none}.ProseMirror table{border-collapse:collapse;margin:0;overflow:hidden;table-layout:fixed;width:100%}.ProseMirror table td,.ProseMirror table th{border:1px solid var(--gray-3);box-sizing:border-box;min-width:1em;padding:6px 8px;position:relative;vertical-align:top}.ProseMirror table td>*,.ProseMirror table th>*{margin-bottom:0}.ProseMirror table th{background-color:var(--gray-1);font-weight:700;text-align:left}.ProseMirror table .selectedCell:after{background:var(--gray-2);content:"";left:0;right:0;top:0;bottom:0;pointer-events:none;position:absolute;z-index:2}.ProseMirror table .column-resize-handle{background-color:var(--purple);bottom:-2px;pointer-events:none;position:absolute;right:-2px;top:0;width:4px}.ProseMirror .tableWrapper{margin:1.5rem 0;overflow-x:auto}.ProseMirror.resize-cursor{cursor:ew-resize;cursor:col-resize}
package/lib/rich-text-editor/index.less CHANGED
@@ -1,191 +0,0 @@
1
- .ProseMirror {
2
- flex: 1;
3
- overflow: auto;
4
- outline: none;
5
-
6
- line-height: 1.6;
7
- font-size: var(--font-base);
8
- --white: #fff;
9
- --black: #2e2b29;
10
- --black-contrast: #110f0e;
11
- --gray-1: rgba(61, 37, 20, 0.05);
12
- --gray-2: rgba(61, 37, 20, 0.08);
13
- --gray-3: rgba(61, 37, 20, 0.12);
14
- --gray-4: rgba(53, 38, 28, 0.3);
15
- --gray-5: rgba(28, 25, 23, 0.6);
16
- --green: #22c55e;
17
- --purple: #6a00f5;
18
- --purple-contrast: #5800cc;
19
- --purple-light: rgba(88, 5, 255, 0.05);
20
- --yellow-contrast: #facc15;
21
- --yellow: rgba(250, 204, 21, 0.4);
22
- --yellow-light: #fffae5;
23
- --red: #ff5c33;
24
- --red-light: #ffebe5;
25
- --shadow: 0px 12px 33px 0px rgba(0, 0, 0, 0.06), 0px 3.618px 9.949px 0px rgba(0, 0, 0, 0.04);
26
- :first-child {
27
- margin-top: 0;
28
- }
29
-
30
- /* List styles */
31
- ul,
32
- ol {
33
- padding: 0 1rem;
34
- margin: 1.25rem 1rem 1.25rem 0.4rem;
35
-
36
- li p {
37
- margin-top: 0.25em;
38
- margin-bottom: 0.25em;
39
- }
40
- }
41
-
42
- /* Heading styles */
43
- h1,
44
- h2,
45
- h3,
46
- h4,
47
- h5,
48
- h6 {
49
- line-height: 1.1;
50
- margin-top: 2.5rem;
51
- text-wrap: pretty;
52
- }
53
-
54
- h1,
55
- h2 {
56
- margin-top: 3.5rem;
57
- margin-bottom: 1.5rem;
58
- }
59
-
60
- h1 {
61
- font-size: 1.4rem;
62
- }
63
-
64
- h2 {
65
- font-size: 1.2rem;
66
- }
67
-
68
- h3 {
69
- font-size: 1.1rem;
70
- }
71
-
72
- h4,
73
- h5,
74
- h6 {
75
- font-size: 1rem;
76
- }
77
-
78
- /* Code and preformatted text styles */
79
- code {
80
- background-color: var(--purple-light);
81
- border-radius: 0.4rem;
82
- color: var(--black);
83
- font-size: 0.85rem;
84
- padding: 0.25em 0.3em;
85
- }
86
-
87
- pre {
88
- background: var(--black);
89
- border-radius: 0.5rem;
90
- color: var(--white);
91
- font-family: 'JetBrainsMono', monospace;
92
- margin: 1.5rem 0;
93
- padding: 0.75rem 1rem;
94
-
95
- code {
96
- background: none;
97
- color: inherit;
98
- font-size: 0.8rem;
99
- padding: 0;
100
- }
101
- }
102
-
103
- blockquote {
104
- border-left: 3px solid var(--gray-3);
105
- margin: 1.5rem 0;
106
- padding-left: 1rem;
107
- }
108
-
109
- hr {
110
- border: none;
111
- border-top: 1px solid var(--gray-2);
112
- margin: 2rem 0;
113
- }
114
-
115
- /* Placeholder (at the top) */
116
- p.is-editor-empty:first-child::before {
117
- color: var(--gray-4);
118
- content: attr(data-placeholder);
119
- float: left;
120
- height: 0;
121
- pointer-events: none;
122
- }
123
-
124
- .is-empty::before {
125
- color: var(--gray-4);
126
- content: attr(data-placeholder);
127
- float: left;
128
- height: 0;
129
- pointer-events: none;
130
- }
131
- /* Table-specific styling */
132
- table {
133
- border-collapse: collapse;
134
- margin: 0;
135
- overflow: hidden;
136
- table-layout: fixed;
137
- width: 100%;
138
-
139
- td,
140
- th {
141
- border: 1px solid var(--gray-3);
142
- box-sizing: border-box;
143
- min-width: 1em;
144
- padding: 6px 8px;
145
- position: relative;
146
- vertical-align: top;
147
-
148
- > * {
149
- margin-bottom: 0;
150
- }
151
- }
152
-
153
- th {
154
- background-color: var(--gray-1);
155
- font-weight: bold;
156
- text-align: left;
157
- }
158
-
159
- .selectedCell:after {
160
- background: var(--gray-2);
161
- content: '';
162
- left: 0;
163
- right: 0;
164
- top: 0;
165
- bottom: 0;
166
- pointer-events: none;
167
- position: absolute;
168
- z-index: 2;
169
- }
170
-
171
- .column-resize-handle {
172
- background-color: var(--purple);
173
- bottom: -2px;
174
- pointer-events: none;
175
- position: absolute;
176
- right: -2px;
177
- top: 0;
178
- width: 4px;
179
- }
180
- }
181
-
182
- .tableWrapper {
183
- margin: 1.5rem 0;
184
- overflow-x: auto;
185
- }
186
-
187
- &.resize-cursor {
188
- cursor: ew-resize;
189
- cursor: col-resize;
190
- }
191
- }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cgboiler/biz-mobile",
3
- "version": "1.18.0",
3
+ "version": "1.18.2",
4
4
  "description": "",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",
@@ -50,9 +50,9 @@
50
50
  "@tiptap/vue-3": "3.0.0-beta.5",
51
51
  "lodash-es": "^4.17.21",
52
52
  "vant": "^4.9.19",
53
+ "@cgboiler/biz-basic": "1.0.2",
53
54
  "@cgboiler/shared": "1.1.1",
54
- "@cgboiler/core": "1.2.2",
55
- "@cgboiler/biz-basic": "1.0.0"
55
+ "@cgboiler/core": "1.2.2"
56
56
  },
57
57
  "scripts": {
58
58
  "dev": "cg-cli dev",