@cgboiler/biz-mobile 1.18.13 → 1.18.15
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.
- package/es/index.d.ts +1 -1
- package/es/index.js +1 -1
- package/es/md-preview/MdPreview.js +39 -1
- package/es/md-preview/index.css +1 -1
- package/es/md-preview/index.less +6 -0
- package/es/org-picker/OrgPicker.js +13 -2
- package/es/org-picker/useApi.js +6 -6
- package/es/project-select/useApi.js +1 -1
- package/es/vue-tsx-shim.d.ts +5 -0
- package/lib/index.d.ts +1 -1
- package/lib/index.js +1 -1
- package/lib/md-preview/MdPreview.js +48 -0
- package/lib/md-preview/index.css +1 -1
- package/lib/md-preview/index.less +6 -0
- package/lib/org-picker/OrgPicker.js +13 -2
- package/lib/org-picker/useApi.js +6 -6
- package/lib/project-select/useApi.js +1 -1
- package/lib/vue-tsx-shim.d.ts +5 -0
- package/package.json +5 -4
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.18.
|
|
11
|
+
export const version: "1.18.14";
|
|
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.18.
|
|
5
|
+
const version = "1.18.14";
|
|
6
6
|
function install(app) {
|
|
7
7
|
const components = [
|
|
8
8
|
MdPreview,
|
|
@@ -14,12 +14,33 @@ var __spreadValues = (a, b) => {
|
|
|
14
14
|
}
|
|
15
15
|
return a;
|
|
16
16
|
};
|
|
17
|
+
var __async = (__this, __arguments, generator) => {
|
|
18
|
+
return new Promise((resolve, reject) => {
|
|
19
|
+
var fulfilled = (value) => {
|
|
20
|
+
try {
|
|
21
|
+
step(generator.next(value));
|
|
22
|
+
} catch (e) {
|
|
23
|
+
reject(e);
|
|
24
|
+
}
|
|
25
|
+
};
|
|
26
|
+
var rejected = (value) => {
|
|
27
|
+
try {
|
|
28
|
+
step(generator.throw(value));
|
|
29
|
+
} catch (e) {
|
|
30
|
+
reject(e);
|
|
31
|
+
}
|
|
32
|
+
};
|
|
33
|
+
var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
|
|
34
|
+
step((generator = generator.apply(__this, __arguments)).next());
|
|
35
|
+
});
|
|
36
|
+
};
|
|
17
37
|
import { createVNode as _createVNode } from "vue";
|
|
18
38
|
import "./_atomic.css";
|
|
19
|
-
import { defineComponent, computed, watch } from "vue";
|
|
39
|
+
import { defineComponent, computed, watch, onMounted } from "vue";
|
|
20
40
|
import { mdPreviewProps } from "./types";
|
|
21
41
|
import "./index.css";
|
|
22
42
|
import { mdPreview } from "@cgboiler/shared";
|
|
43
|
+
import mermaid from "mermaid";
|
|
23
44
|
const {
|
|
24
45
|
initMarked,
|
|
25
46
|
renderMarkdown,
|
|
@@ -47,13 +68,30 @@ var stdin_default = defineComponent({
|
|
|
47
68
|
}
|
|
48
69
|
return props.typewriter ? currentText.value : htmlContent.value;
|
|
49
70
|
});
|
|
71
|
+
const renderMermaidDiagrams = () => __async(this, null, function* () {
|
|
72
|
+
try {
|
|
73
|
+
yield mermaid.run();
|
|
74
|
+
} catch (error) {
|
|
75
|
+
console.error("Mermaid rendering failed:", error);
|
|
76
|
+
}
|
|
77
|
+
});
|
|
50
78
|
watch([() => props.text, () => props.typewriterKey], () => {
|
|
51
79
|
if (props.typewriter) {
|
|
52
80
|
typewriterController.start(htmlContent.value);
|
|
53
81
|
}
|
|
82
|
+
renderMermaidDiagrams();
|
|
54
83
|
}, {
|
|
55
84
|
immediate: true
|
|
56
85
|
});
|
|
86
|
+
onMounted(() => {
|
|
87
|
+
mermaid.initialize({
|
|
88
|
+
startOnLoad: false,
|
|
89
|
+
// 非常重要!我们手动控制渲染时机
|
|
90
|
+
theme: "default"
|
|
91
|
+
// 可选主题: 'default', 'dark', 'forest', 'neutral'
|
|
92
|
+
});
|
|
93
|
+
renderMermaidDiagrams();
|
|
94
|
+
});
|
|
57
95
|
return () => _createVNode("div", {
|
|
58
96
|
"class": "cgx-markdown-preview",
|
|
59
97
|
"innerHTML": displayContent.value
|
package/es/md-preview/index.css
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
.katex-block{display:block;margin:1em 0;text-align:center;overflow-x:auto;overflow-y:hidden}.cgx-markdown-preview .diff-container{border:1px solid #ebeef5;border-radius:4px;overflow:auto}.cgx-markdown-preview .diff-equal{color:#606266}.cgx-markdown-preview .diff-delete{background-color:#ffeef0;color:#f56c6c;text-decoration:line-through}.cgx-markdown-preview .diff-insert{background-color:#e6ffec;color:#67c23a}.cgx-markdown-preview .diff-unified-view pre{margin:0;padding:8px;white-space:pre-wrap;word-break:break-word}.cgx-markdown-preview{line-height:1.6;font-size:var(--font-base, 16px)}.cgx-markdown-preview ol{list-style:auto}.cgx-markdown-preview ul{list-style:disc}.cgx-markdown-preview ol,.cgx-markdown-preview ul{padding-left:1.5em;margin:0 0 12px}.cgx-markdown-preview li::marker{text-align:start!important}.cgx-markdown-preview h1{font-size:2em;font-weight:700;margin:16px 0}.cgx-markdown-preview h2{font-size:1.5em;font-weight:700;margin:14px 0}.cgx-markdown-preview p{margin:12px 0}.cgx-markdown-preview blockquote{margin:0;padding-left:1em;border-left:4px solid #ddd;color:#666}.cgx-markdown-preview table{border-collapse:collapse;width:100%;margin-bottom:16px}.cgx-markdown-preview th,.cgx-markdown-preview td{border:1px solid #ddd;padding:8px;text-align:left}.cgx-markdown-preview th{background-color:#f6f8fa}
|
|
1
|
+
.katex-block{display:block;margin:1em 0;text-align:center;overflow-x:auto;overflow-y:hidden}.cgx-markdown-preview .diff-container{border:1px solid #ebeef5;border-radius:4px;overflow:auto}.cgx-markdown-preview .diff-equal{color:#606266}.cgx-markdown-preview .diff-delete{background-color:#ffeef0;color:#f56c6c;text-decoration:line-through}.cgx-markdown-preview .diff-insert{background-color:#e6ffec;color:#67c23a}.cgx-markdown-preview .diff-unified-view pre{margin:0;padding:8px;white-space:pre-wrap;word-break:break-word}.cgx-markdown-preview{line-height:1.6;font-size:var(--font-base, 16px)}.cgx-markdown-preview ol{list-style:auto}.cgx-markdown-preview ul{list-style:disc}.cgx-markdown-preview ol,.cgx-markdown-preview ul{padding-left:1.5em;margin:0 0 12px}.cgx-markdown-preview li::marker{text-align:start!important}.cgx-markdown-preview h1{font-size:2em;font-weight:700;margin:16px 0}.cgx-markdown-preview h2{font-size:1.5em;font-weight:700;margin:14px 0}.cgx-markdown-preview p{margin:12px 0}.cgx-markdown-preview blockquote{margin:0;padding-left:1em;border-left:4px solid #ddd;color:#666}.cgx-markdown-preview table{border-collapse:collapse;width:100%;margin-bottom:16px}.cgx-markdown-preview th,.cgx-markdown-preview td{border:1px solid #ddd;padding:8px;text-align:left}.cgx-markdown-preview th{background-color:#f6f8fa}.cgx-markdown-preview .mermaid{text-align:center;font-size:14px;line-height:1.2}
|
package/es/md-preview/index.less
CHANGED
|
@@ -113,12 +113,23 @@ var stdin_default = defineComponent({
|
|
|
113
113
|
return;
|
|
114
114
|
const deptUsers = getUsersByDeptId(item.id);
|
|
115
115
|
const isFullySelected = fullySelectedDepts.value.has(item.id);
|
|
116
|
+
const deduplicateById = (arr) => {
|
|
117
|
+
const seenIds = /* @__PURE__ */ new Set();
|
|
118
|
+
return arr.filter((item2) => {
|
|
119
|
+
if (seenIds.has(item2.id)) {
|
|
120
|
+
return false;
|
|
121
|
+
}
|
|
122
|
+
seenIds.add(item2.id);
|
|
123
|
+
return true;
|
|
124
|
+
});
|
|
125
|
+
};
|
|
116
126
|
if (isFullySelected) {
|
|
117
127
|
const userIdsToRemove = new Set(deptUsers.map((user) => user.id));
|
|
118
|
-
selectedItems.value = selectedItems.value.filter((selectedItem) => !userIdsToRemove.has(selectedItem.id));
|
|
128
|
+
selectedItems.value = deduplicateById(selectedItems.value.filter((selectedItem) => !userIdsToRemove.has(selectedItem.id)));
|
|
119
129
|
} else {
|
|
120
130
|
const currentSelectedIds = new Set(selectedItems.value.map((item2) => item2.id));
|
|
121
|
-
|
|
131
|
+
let usersToAdd = deptUsers.filter((user) => !currentSelectedIds.has(user.id));
|
|
132
|
+
usersToAdd = deduplicateById(usersToAdd);
|
|
122
133
|
selectedItems.value.push(...usersToAdd);
|
|
123
134
|
}
|
|
124
135
|
};
|
package/es/org-picker/useApi.js
CHANGED
|
@@ -34,7 +34,7 @@ const fetchData = (url, cacheKey) => __async(void 0, null, function* () {
|
|
|
34
34
|
return res;
|
|
35
35
|
});
|
|
36
36
|
const fetchOrgList = (deptId) => __async(void 0, null, function* () {
|
|
37
|
-
const url =
|
|
37
|
+
const url = `${window.globalConfig.wFlowApi}/v1/oa/org/tree/cloud?deptId=${deptId}&type=user`;
|
|
38
38
|
return fetchData(url, deptId || "");
|
|
39
39
|
});
|
|
40
40
|
const userList = ref([]);
|
|
@@ -108,9 +108,9 @@ const useApi = () => {
|
|
|
108
108
|
orgSearchList.value = [];
|
|
109
109
|
return;
|
|
110
110
|
}
|
|
111
|
-
const url =
|
|
111
|
+
const url = `${window.globalConfig.wFlowApi}/v1/oa/org/tree/user/search/cloud?userName=${userName}`;
|
|
112
112
|
const searchResults = yield fetchData(url);
|
|
113
|
-
orgSearchList.value = searchResults.filter((item) => item.type !== "user" || item.status !== 5);
|
|
113
|
+
orgSearchList.value = searchResults.filter((item) => item.type !== "user" || item.status !== 5).filter((item, index, self) => index === self.findIndex((other) => other.id === item.id));
|
|
114
114
|
}), 300);
|
|
115
115
|
const RECENT_SELECTED_USERS_KEY = "recent_selected_users_history";
|
|
116
116
|
const MAX_RECENT_SELECTIONS = 15;
|
|
@@ -125,7 +125,7 @@ const useApi = () => {
|
|
|
125
125
|
}
|
|
126
126
|
});
|
|
127
127
|
const url = decodeURIComponent(
|
|
128
|
-
|
|
128
|
+
`${window.globalConfig.wFlowApi}/v1/wflow/process/form/wf687dda91e4b027b047d4654c/data?keywords=${name}_${user.userId}&pageNo=1&pageSize=20`
|
|
129
129
|
);
|
|
130
130
|
const res = yield fetchData(url);
|
|
131
131
|
let recentList = [];
|
|
@@ -162,10 +162,10 @@ const useApi = () => {
|
|
|
162
162
|
data.field5375578403639 = JSON.stringify(list);
|
|
163
163
|
}
|
|
164
164
|
if (dataId.value) {
|
|
165
|
-
url =
|
|
165
|
+
url = `${window.globalConfig.wFlowApi}/v1/wflow/process/form/wf687dda91e4b027b047d4654c/data/${dataId.value}`;
|
|
166
166
|
method = "PUT";
|
|
167
167
|
} else {
|
|
168
|
-
url =
|
|
168
|
+
url = `${window.globalConfig.wFlowApi}/v1/wflow/process/start/4e441786-65fa-11f0-aef7-ce938f4cd78d`;
|
|
169
169
|
method = "POST";
|
|
170
170
|
}
|
|
171
171
|
const token = user.token;
|
|
@@ -24,7 +24,7 @@ const useApi = () => {
|
|
|
24
24
|
const projectList = ref([]);
|
|
25
25
|
const getProjectList = () => __async(void 0, null, function* () {
|
|
26
26
|
const res = yield useFetch(
|
|
27
|
-
|
|
27
|
+
`${window.globalConfig.vxApi}/v1/note/projects`,
|
|
28
28
|
{
|
|
29
29
|
method: "GET"
|
|
30
30
|
}
|
package/es/vue-tsx-shim.d.ts
CHANGED
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.18.
|
|
11
|
+
export const version: "1.18.14";
|
|
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.18.
|
|
48
|
+
const version = "1.18.14";
|
|
49
49
|
function install(app) {
|
|
50
50
|
const components = [
|
|
51
51
|
import_md_preview.default,
|
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
var __create = Object.create;
|
|
1
2
|
var __defProp = Object.defineProperty;
|
|
2
3
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
3
4
|
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
4
5
|
var __getOwnPropSymbols = Object.getOwnPropertySymbols;
|
|
6
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
5
7
|
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
8
|
var __propIsEnum = Object.prototype.propertyIsEnumerable;
|
|
7
9
|
var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
@@ -28,7 +30,35 @@ var __copyProps = (to, from, except, desc) => {
|
|
|
28
30
|
}
|
|
29
31
|
return to;
|
|
30
32
|
};
|
|
33
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
34
|
+
// If the importer is in node compatibility mode or this is not an ESM
|
|
35
|
+
// file that has been converted to a CommonJS file using a Babel-
|
|
36
|
+
// compatible transform (i.e. "__esModule" has not been set), then set
|
|
37
|
+
// "default" to the CommonJS "module.exports" for node compatibility.
|
|
38
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
39
|
+
mod
|
|
40
|
+
));
|
|
31
41
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
42
|
+
var __async = (__this, __arguments, generator) => {
|
|
43
|
+
return new Promise((resolve, reject) => {
|
|
44
|
+
var fulfilled = (value) => {
|
|
45
|
+
try {
|
|
46
|
+
step(generator.next(value));
|
|
47
|
+
} catch (e) {
|
|
48
|
+
reject(e);
|
|
49
|
+
}
|
|
50
|
+
};
|
|
51
|
+
var rejected = (value) => {
|
|
52
|
+
try {
|
|
53
|
+
step(generator.throw(value));
|
|
54
|
+
} catch (e) {
|
|
55
|
+
reject(e);
|
|
56
|
+
}
|
|
57
|
+
};
|
|
58
|
+
var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
|
|
59
|
+
step((generator = generator.apply(__this, __arguments)).next());
|
|
60
|
+
});
|
|
61
|
+
};
|
|
32
62
|
var stdin_exports = {};
|
|
33
63
|
__export(stdin_exports, {
|
|
34
64
|
default: () => stdin_default
|
|
@@ -40,6 +70,7 @@ var import_vue2 = require("vue");
|
|
|
40
70
|
var import_types = require("./types");
|
|
41
71
|
var import_index = require("./index.css");
|
|
42
72
|
var import_shared = require("@cgboiler/shared");
|
|
73
|
+
var import_mermaid = __toESM(require("mermaid"));
|
|
43
74
|
const {
|
|
44
75
|
initMarked,
|
|
45
76
|
renderMarkdown,
|
|
@@ -67,13 +98,30 @@ var stdin_default = (0, import_vue2.defineComponent)({
|
|
|
67
98
|
}
|
|
68
99
|
return props.typewriter ? currentText.value : htmlContent.value;
|
|
69
100
|
});
|
|
101
|
+
const renderMermaidDiagrams = () => __async(this, null, function* () {
|
|
102
|
+
try {
|
|
103
|
+
yield import_mermaid.default.run();
|
|
104
|
+
} catch (error) {
|
|
105
|
+
console.error("Mermaid rendering failed:", error);
|
|
106
|
+
}
|
|
107
|
+
});
|
|
70
108
|
(0, import_vue2.watch)([() => props.text, () => props.typewriterKey], () => {
|
|
71
109
|
if (props.typewriter) {
|
|
72
110
|
typewriterController.start(htmlContent.value);
|
|
73
111
|
}
|
|
112
|
+
renderMermaidDiagrams();
|
|
74
113
|
}, {
|
|
75
114
|
immediate: true
|
|
76
115
|
});
|
|
116
|
+
(0, import_vue2.onMounted)(() => {
|
|
117
|
+
import_mermaid.default.initialize({
|
|
118
|
+
startOnLoad: false,
|
|
119
|
+
// 非常重要!我们手动控制渲染时机
|
|
120
|
+
theme: "default"
|
|
121
|
+
// 可选主题: 'default', 'dark', 'forest', 'neutral'
|
|
122
|
+
});
|
|
123
|
+
renderMermaidDiagrams();
|
|
124
|
+
});
|
|
77
125
|
return () => (0, import_vue.createVNode)("div", {
|
|
78
126
|
"class": "cgx-markdown-preview",
|
|
79
127
|
"innerHTML": displayContent.value
|
package/lib/md-preview/index.css
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
.katex-block{display:block;margin:1em 0;text-align:center;overflow-x:auto;overflow-y:hidden}.cgx-markdown-preview .diff-container{border:1px solid #ebeef5;border-radius:4px;overflow:auto}.cgx-markdown-preview .diff-equal{color:#606266}.cgx-markdown-preview .diff-delete{background-color:#ffeef0;color:#f56c6c;text-decoration:line-through}.cgx-markdown-preview .diff-insert{background-color:#e6ffec;color:#67c23a}.cgx-markdown-preview .diff-unified-view pre{margin:0;padding:8px;white-space:pre-wrap;word-break:break-word}.cgx-markdown-preview{line-height:1.6;font-size:var(--font-base, 16px)}.cgx-markdown-preview ol{list-style:auto}.cgx-markdown-preview ul{list-style:disc}.cgx-markdown-preview ol,.cgx-markdown-preview ul{padding-left:1.5em;margin:0 0 12px}.cgx-markdown-preview li::marker{text-align:start!important}.cgx-markdown-preview h1{font-size:2em;font-weight:700;margin:16px 0}.cgx-markdown-preview h2{font-size:1.5em;font-weight:700;margin:14px 0}.cgx-markdown-preview p{margin:12px 0}.cgx-markdown-preview blockquote{margin:0;padding-left:1em;border-left:4px solid #ddd;color:#666}.cgx-markdown-preview table{border-collapse:collapse;width:100%;margin-bottom:16px}.cgx-markdown-preview th,.cgx-markdown-preview td{border:1px solid #ddd;padding:8px;text-align:left}.cgx-markdown-preview th{background-color:#f6f8fa}
|
|
1
|
+
.katex-block{display:block;margin:1em 0;text-align:center;overflow-x:auto;overflow-y:hidden}.cgx-markdown-preview .diff-container{border:1px solid #ebeef5;border-radius:4px;overflow:auto}.cgx-markdown-preview .diff-equal{color:#606266}.cgx-markdown-preview .diff-delete{background-color:#ffeef0;color:#f56c6c;text-decoration:line-through}.cgx-markdown-preview .diff-insert{background-color:#e6ffec;color:#67c23a}.cgx-markdown-preview .diff-unified-view pre{margin:0;padding:8px;white-space:pre-wrap;word-break:break-word}.cgx-markdown-preview{line-height:1.6;font-size:var(--font-base, 16px)}.cgx-markdown-preview ol{list-style:auto}.cgx-markdown-preview ul{list-style:disc}.cgx-markdown-preview ol,.cgx-markdown-preview ul{padding-left:1.5em;margin:0 0 12px}.cgx-markdown-preview li::marker{text-align:start!important}.cgx-markdown-preview h1{font-size:2em;font-weight:700;margin:16px 0}.cgx-markdown-preview h2{font-size:1.5em;font-weight:700;margin:14px 0}.cgx-markdown-preview p{margin:12px 0}.cgx-markdown-preview blockquote{margin:0;padding-left:1em;border-left:4px solid #ddd;color:#666}.cgx-markdown-preview table{border-collapse:collapse;width:100%;margin-bottom:16px}.cgx-markdown-preview th,.cgx-markdown-preview td{border:1px solid #ddd;padding:8px;text-align:left}.cgx-markdown-preview th{background-color:#f6f8fa}.cgx-markdown-preview .mermaid{text-align:center;font-size:14px;line-height:1.2}
|
|
@@ -145,12 +145,23 @@ var stdin_default = (0, import_vue2.defineComponent)({
|
|
|
145
145
|
return;
|
|
146
146
|
const deptUsers = getUsersByDeptId(item.id);
|
|
147
147
|
const isFullySelected = fullySelectedDepts.value.has(item.id);
|
|
148
|
+
const deduplicateById = (arr) => {
|
|
149
|
+
const seenIds = /* @__PURE__ */ new Set();
|
|
150
|
+
return arr.filter((item2) => {
|
|
151
|
+
if (seenIds.has(item2.id)) {
|
|
152
|
+
return false;
|
|
153
|
+
}
|
|
154
|
+
seenIds.add(item2.id);
|
|
155
|
+
return true;
|
|
156
|
+
});
|
|
157
|
+
};
|
|
148
158
|
if (isFullySelected) {
|
|
149
159
|
const userIdsToRemove = new Set(deptUsers.map((user) => user.id));
|
|
150
|
-
selectedItems.value = selectedItems.value.filter((selectedItem) => !userIdsToRemove.has(selectedItem.id));
|
|
160
|
+
selectedItems.value = deduplicateById(selectedItems.value.filter((selectedItem) => !userIdsToRemove.has(selectedItem.id)));
|
|
151
161
|
} else {
|
|
152
162
|
const currentSelectedIds = new Set(selectedItems.value.map((item2) => item2.id));
|
|
153
|
-
|
|
163
|
+
let usersToAdd = deptUsers.filter((user) => !currentSelectedIds.has(user.id));
|
|
164
|
+
usersToAdd = deduplicateById(usersToAdd);
|
|
154
165
|
selectedItems.value.push(...usersToAdd);
|
|
155
166
|
}
|
|
156
167
|
};
|
package/lib/org-picker/useApi.js
CHANGED
|
@@ -57,7 +57,7 @@ const fetchData = (url, cacheKey) => __async(void 0, null, function* () {
|
|
|
57
57
|
return res;
|
|
58
58
|
});
|
|
59
59
|
const fetchOrgList = (deptId) => __async(void 0, null, function* () {
|
|
60
|
-
const url =
|
|
60
|
+
const url = `${window.globalConfig.wFlowApi}/v1/oa/org/tree/cloud?deptId=${deptId}&type=user`;
|
|
61
61
|
return fetchData(url, deptId || "");
|
|
62
62
|
});
|
|
63
63
|
const userList = (0, import_vue.ref)([]);
|
|
@@ -131,9 +131,9 @@ const useApi = () => {
|
|
|
131
131
|
orgSearchList.value = [];
|
|
132
132
|
return;
|
|
133
133
|
}
|
|
134
|
-
const url =
|
|
134
|
+
const url = `${window.globalConfig.wFlowApi}/v1/oa/org/tree/user/search/cloud?userName=${userName}`;
|
|
135
135
|
const searchResults = yield fetchData(url);
|
|
136
|
-
orgSearchList.value = searchResults.filter((item) => item.type !== "user" || item.status !== 5);
|
|
136
|
+
orgSearchList.value = searchResults.filter((item) => item.type !== "user" || item.status !== 5).filter((item, index, self) => index === self.findIndex((other) => other.id === item.id));
|
|
137
137
|
}), 300);
|
|
138
138
|
const RECENT_SELECTED_USERS_KEY = "recent_selected_users_history";
|
|
139
139
|
const MAX_RECENT_SELECTIONS = 15;
|
|
@@ -148,7 +148,7 @@ const useApi = () => {
|
|
|
148
148
|
}
|
|
149
149
|
});
|
|
150
150
|
const url = decodeURIComponent(
|
|
151
|
-
|
|
151
|
+
`${window.globalConfig.wFlowApi}/v1/wflow/process/form/wf687dda91e4b027b047d4654c/data?keywords=${name}_${user.userId}&pageNo=1&pageSize=20`
|
|
152
152
|
);
|
|
153
153
|
const res = yield fetchData(url);
|
|
154
154
|
let recentList = [];
|
|
@@ -185,10 +185,10 @@ const useApi = () => {
|
|
|
185
185
|
data.field5375578403639 = JSON.stringify(list);
|
|
186
186
|
}
|
|
187
187
|
if (dataId.value) {
|
|
188
|
-
url =
|
|
188
|
+
url = `${window.globalConfig.wFlowApi}/v1/wflow/process/form/wf687dda91e4b027b047d4654c/data/${dataId.value}`;
|
|
189
189
|
method = "PUT";
|
|
190
190
|
} else {
|
|
191
|
-
url =
|
|
191
|
+
url = `${window.globalConfig.wFlowApi}/v1/wflow/process/start/4e441786-65fa-11f0-aef7-ce938f4cd78d`;
|
|
192
192
|
method = "POST";
|
|
193
193
|
}
|
|
194
194
|
const token = user.token;
|
|
@@ -46,7 +46,7 @@ const useApi = () => {
|
|
|
46
46
|
const projectList = (0, import_vue.ref)([]);
|
|
47
47
|
const getProjectList = () => __async(void 0, null, function* () {
|
|
48
48
|
const res = yield (0, import_core.useFetch)(
|
|
49
|
-
|
|
49
|
+
`${window.globalConfig.vxApi}/v1/note/projects`,
|
|
50
50
|
{
|
|
51
51
|
method: "GET"
|
|
52
52
|
}
|
package/lib/vue-tsx-shim.d.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cgboiler/biz-mobile",
|
|
3
|
-
"version": "1.18.
|
|
3
|
+
"version": "1.18.15",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"module": "es/index.js",
|
|
@@ -48,11 +48,12 @@
|
|
|
48
48
|
"@tiptap/pm": "3.0.0-beta.5",
|
|
49
49
|
"@tiptap/starter-kit": "3.0.0-beta.5",
|
|
50
50
|
"@tiptap/vue-3": "3.0.0-beta.5",
|
|
51
|
+
"mermaid": "^11.10.1",
|
|
51
52
|
"lodash-es": "^4.17.21",
|
|
52
53
|
"vant": "^4.9.19",
|
|
53
|
-
"@cgboiler/core": "1.2.
|
|
54
|
-
"@cgboiler/
|
|
55
|
-
"@cgboiler/
|
|
54
|
+
"@cgboiler/core": "1.2.10",
|
|
55
|
+
"@cgboiler/biz-basic": "1.0.18",
|
|
56
|
+
"@cgboiler/shared": "1.1.2"
|
|
56
57
|
},
|
|
57
58
|
"scripts": {
|
|
58
59
|
"dev": "cg-cli dev",
|