@symbo.ls/fetch 2.6.14 → 2.6.18
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/index.js +34 -14
- package/package.json +2 -2
package/index.js
CHANGED
|
@@ -24,7 +24,7 @@ export const syncSystem = (data, el, s) => {
|
|
|
24
24
|
let temporaryProject = TMP_DATA[s.appKey]
|
|
25
25
|
if (!temporaryProject) temporaryProject = {}
|
|
26
26
|
const { SYSTEM, STATE } = temporaryProject
|
|
27
|
-
|
|
27
|
+
let { system, state } = data
|
|
28
28
|
|
|
29
29
|
const defObjs = {
|
|
30
30
|
system: SYSTEM || CONFIG_DEFAULT,
|
|
@@ -34,17 +34,23 @@ export const syncSystem = (data, el, s) => {
|
|
|
34
34
|
if (isObject(system)) {
|
|
35
35
|
deepMerge(system, defObjs.system)
|
|
36
36
|
} else {
|
|
37
|
+
system = defObjs.system
|
|
37
38
|
// set({ $id: s.projectId, system: defObjs.system })
|
|
38
39
|
}
|
|
39
40
|
|
|
40
41
|
if (isObject(state)) {
|
|
41
42
|
deepMerge(state, defObjs.state)
|
|
42
43
|
} else {
|
|
44
|
+
state = defObjs.state
|
|
43
45
|
// set({ $id: s.projectId, state: defObjs.state })
|
|
44
46
|
}
|
|
45
47
|
|
|
46
|
-
deepMerge(s.PROJECT_SYSTEM, system)
|
|
47
|
-
deepMerge(s.PROJECT_STATE, state)
|
|
48
|
+
// deepMerge(s.PROJECT_SYSTEM, system)
|
|
49
|
+
// deepMerge(s.PROJECT_STATE, state)
|
|
50
|
+
s.update({
|
|
51
|
+
PROJECT_SYSTEM: system,
|
|
52
|
+
PROJECT_STATE: state
|
|
53
|
+
})
|
|
48
54
|
}
|
|
49
55
|
|
|
50
56
|
export const publishSystem = (data, el, s) => {
|
|
@@ -58,8 +64,11 @@ export const publishSystem = (data, el, s) => {
|
|
|
58
64
|
export const fetchProject = (el, s, { userName, projectId, ...options }) => {
|
|
59
65
|
fetch({
|
|
60
66
|
$id: projectId,
|
|
61
|
-
$all: true
|
|
62
|
-
|
|
67
|
+
$all: true,
|
|
68
|
+
icon: {
|
|
69
|
+
src: true
|
|
70
|
+
}
|
|
71
|
+
}, data => {
|
|
63
72
|
const { key, name, icon } = data
|
|
64
73
|
|
|
65
74
|
setCookie('appKey', key)
|
|
@@ -67,8 +76,8 @@ export const fetchProject = (el, s, { userName, projectId, ...options }) => {
|
|
|
67
76
|
s.update({
|
|
68
77
|
appKey: key,
|
|
69
78
|
projectName: name,
|
|
70
|
-
userName,
|
|
71
|
-
projectId,
|
|
79
|
+
userName: userName,
|
|
80
|
+
projectId: projectId,
|
|
72
81
|
icon
|
|
73
82
|
}, options)
|
|
74
83
|
|
|
@@ -77,21 +86,32 @@ export const fetchProject = (el, s, { userName, projectId, ...options }) => {
|
|
|
77
86
|
}
|
|
78
87
|
|
|
79
88
|
export const fetchUser = (el, s, options) => {
|
|
80
|
-
|
|
81
|
-
|
|
89
|
+
const { userName, projectId } = s
|
|
90
|
+
if (!userName || !projectId) {
|
|
91
|
+
fetch({
|
|
92
|
+
$id: s.userId,
|
|
93
|
+
name: true,
|
|
94
|
+
projects: {
|
|
95
|
+
id: true,
|
|
96
|
+
name: true,
|
|
97
|
+
key: true,
|
|
98
|
+
icon: {
|
|
99
|
+
src: true
|
|
100
|
+
},
|
|
101
|
+
$list: true
|
|
102
|
+
}
|
|
103
|
+
}, data => {
|
|
82
104
|
const { projects } = data
|
|
83
105
|
const userName = data.name
|
|
84
106
|
if (projects) {
|
|
85
|
-
s.update({ projects })
|
|
86
|
-
const projectId = projects[s.activeProject || 0]
|
|
107
|
+
s.update({ userName, projects })
|
|
108
|
+
const projectId = projects[s.activeProject || 0].id
|
|
87
109
|
fetchProject(el, s, { userName, projectId, ...options })
|
|
88
110
|
}
|
|
89
111
|
})
|
|
90
112
|
} else {
|
|
91
113
|
fetchProject(el, s, {
|
|
92
|
-
userName
|
|
93
|
-
projectId: s.projectId,
|
|
94
|
-
...options
|
|
114
|
+
userName, projectId, ...options
|
|
95
115
|
})
|
|
96
116
|
}
|
|
97
117
|
}
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@symbo.ls/fetch",
|
|
3
|
-
"version": "2.6.
|
|
3
|
+
"version": "2.6.18",
|
|
4
4
|
"main": "index.js",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"@symbo.ls/based": "latest",
|
|
7
7
|
"@symbo.ls/config-default": "latest",
|
|
8
8
|
"@symbo.ls/temp-db": "latest"
|
|
9
9
|
},
|
|
10
|
-
"gitHead": "
|
|
10
|
+
"gitHead": "931d216ab7ed3209ba9958d1b898244b0c926a66"
|
|
11
11
|
}
|