km-card-layout-component-miniprogram 0.1.27 → 0.1.29
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.
|
@@ -36,25 +36,6 @@ function normalizeMoreCompany(data) {
|
|
|
36
36
|
};
|
|
37
37
|
}
|
|
38
38
|
exports.normalizeMoreCompany = normalizeMoreCompany;
|
|
39
|
-
const handleSpecialFields = (data) => {
|
|
40
|
-
var _a;
|
|
41
|
-
const user = (_a = data.user) !== null && _a !== void 0 ? _a : {};
|
|
42
|
-
return {
|
|
43
|
-
...data,
|
|
44
|
-
user: {
|
|
45
|
-
...user,
|
|
46
|
-
baseCompanyDuty: user.company && user.duty ? `${user.company} ${user.duty}` : user.baseCompanyDuty,
|
|
47
|
-
moreCardInfo: user.moreCardInfo
|
|
48
|
-
? {
|
|
49
|
-
...user.moreCardInfo,
|
|
50
|
-
company: Array.isArray(user.moreCardInfo.company)
|
|
51
|
-
? user.moreCardInfo.company.map((item) => `${item.company} ${item.duty}`)
|
|
52
|
-
: user.moreCardInfo.company,
|
|
53
|
-
}
|
|
54
|
-
: user.moreCardInfo,
|
|
55
|
-
},
|
|
56
|
-
};
|
|
57
|
-
};
|
|
58
39
|
const pickCardId = (layout, idx) => {
|
|
59
40
|
if (layout && (layout.name || layout.id))
|
|
60
41
|
return layout.name || layout.id;
|
|
@@ -131,7 +112,7 @@ Component({
|
|
|
131
112
|
const layoutInput = (0, exports.hasCompanyDutyKey)(this.data.layout)
|
|
132
113
|
? (0, index_1.processCardLayout)(this.data.layout, data)
|
|
133
114
|
: this.data.layout;
|
|
134
|
-
const rootData = handleSpecialFields(data);
|
|
115
|
+
const rootData = (0, index_1.handleSpecialFields)(data);
|
|
135
116
|
if (!layoutInput.length) {
|
|
136
117
|
this.setData({ cards: [], rootData });
|
|
137
118
|
return;
|
|
@@ -8,17 +8,18 @@ function handleSpecialFields(data) {
|
|
|
8
8
|
...data,
|
|
9
9
|
user: {
|
|
10
10
|
...user,
|
|
11
|
-
// 1. 构造 baseCompanyDuty
|
|
12
11
|
baseCompanyDuty: user.company && user.duty
|
|
13
12
|
? `${user.company} ${user.duty}`
|
|
14
13
|
: user.baseCompanyDuty,
|
|
15
|
-
// 2. 构造 moreCardInfo.company
|
|
16
14
|
moreCardInfo: user.moreCardInfo
|
|
17
15
|
? {
|
|
18
16
|
...user.moreCardInfo,
|
|
19
17
|
company: Array.isArray(user.moreCardInfo.company)
|
|
20
18
|
? user.moreCardInfo.company.map(item => `${item.company} ${item.duty}`)
|
|
21
19
|
: user.moreCardInfo.company,
|
|
20
|
+
duty: Array.isArray(user.moreCardInfo.duty)
|
|
21
|
+
? user.moreCardInfo.duty.join(' | ')
|
|
22
|
+
: user.moreCardInfo.duty,
|
|
22
23
|
}
|
|
23
24
|
: user.moreCardInfo,
|
|
24
25
|
},
|
package/package.json
CHANGED
|
@@ -2,6 +2,7 @@ import type { CardElement, CardLayoutSchema } from "../../vendor/km-card-layout-
|
|
|
2
2
|
import {
|
|
3
3
|
buildBackgroundStyle,
|
|
4
4
|
buildCardStyle,
|
|
5
|
+
handleSpecialFields,
|
|
5
6
|
normalizeLayout,
|
|
6
7
|
processCardLayout,
|
|
7
8
|
styleObjectToString,
|
|
@@ -51,27 +52,6 @@ export function normalizeMoreCompany(data: AnyObject): AnyObject {
|
|
|
51
52
|
};
|
|
52
53
|
}
|
|
53
54
|
|
|
54
|
-
const handleSpecialFields = (data: { user: Record<string, any> }) => {
|
|
55
|
-
const user = data.user ?? {};
|
|
56
|
-
return {
|
|
57
|
-
...data,
|
|
58
|
-
user: {
|
|
59
|
-
...user,
|
|
60
|
-
baseCompanyDuty:
|
|
61
|
-
user.company && user.duty ? `${user.company} ${user.duty}` : user.baseCompanyDuty,
|
|
62
|
-
moreCardInfo: user.moreCardInfo
|
|
63
|
-
? {
|
|
64
|
-
...user.moreCardInfo,
|
|
65
|
-
company: Array.isArray(user.moreCardInfo.company)
|
|
66
|
-
? (user.moreCardInfo.company as CompanyDuty[]).map(
|
|
67
|
-
(item) => `${item.company} ${item.duty}`
|
|
68
|
-
)
|
|
69
|
-
: user.moreCardInfo.company,
|
|
70
|
-
}
|
|
71
|
-
: user.moreCardInfo,
|
|
72
|
-
},
|
|
73
|
-
};
|
|
74
|
-
};
|
|
75
55
|
|
|
76
56
|
type RenderElement = CardElement;
|
|
77
57
|
|
|
@@ -14,13 +14,11 @@ export function handleSpecialFields(data: { user: Record<string, any> }): {
|
|
|
14
14
|
...data,
|
|
15
15
|
user: {
|
|
16
16
|
...user,
|
|
17
|
-
// 1. 构造 baseCompanyDuty
|
|
18
17
|
baseCompanyDuty:
|
|
19
18
|
user.company && user.duty
|
|
20
19
|
? `${user.company} ${user.duty}`
|
|
21
20
|
: user.baseCompanyDuty,
|
|
22
21
|
|
|
23
|
-
// 2. 构造 moreCardInfo.company
|
|
24
22
|
moreCardInfo: user.moreCardInfo
|
|
25
23
|
? {
|
|
26
24
|
...user.moreCardInfo,
|
|
@@ -29,6 +27,10 @@ export function handleSpecialFields(data: { user: Record<string, any> }): {
|
|
|
29
27
|
item => `${item.company} ${item.duty}`
|
|
30
28
|
)
|
|
31
29
|
: user.moreCardInfo.company,
|
|
30
|
+
|
|
31
|
+
duty: Array.isArray(user.moreCardInfo.duty)
|
|
32
|
+
? user.moreCardInfo.duty.join(' | ')
|
|
33
|
+
: user.moreCardInfo.duty,
|
|
32
34
|
}
|
|
33
35
|
: user.moreCardInfo,
|
|
34
36
|
},
|
|
@@ -37,8 +39,6 @@ export function handleSpecialFields(data: { user: Record<string, any> }): {
|
|
|
37
39
|
|
|
38
40
|
|
|
39
41
|
|
|
40
|
-
|
|
41
|
-
|
|
42
42
|
type Data = { user: Record<string, any> };
|
|
43
43
|
|
|
44
44
|
const SHOW_KEYS = new Set([
|