Commit d38c4004 authored by 劳工's avatar 劳工

Merge branch 'dev' into 'master'

修复没有序列化custom的问题

See merge request !3
parents 238212f9 cd25a6b9
...@@ -73,13 +73,18 @@ async function packData(data, {getProcesses, getScripts, getCustoms}) { ...@@ -73,13 +73,18 @@ async function packData(data, {getProcesses, getScripts, getCustoms}) {
} }
} }
newData.customs = data.customs && data.customs.length > 0 ? await getCustoms(data.customs) : []; newData.customs = [];
if (data.customs && data.customs.length > 0) {
newData.customs = await getCustoms(data.customs).map(item => {
return JSON.parse(item);
});
}
return JSON.stringify(newData); return JSON.stringify(newData);
} }
function findDepPids(list, process) { function findDepPids(list, process) {
if(process.sub){ if (process.sub) {
for (let key in process.sub) { for (let key in process.sub) {
let p = process.sub[key]; let p = process.sub[key];
if (!list.includes(p.meta)) { if (!list.includes(p.meta)) {
......
This diff is collapsed.
...@@ -77,13 +77,18 @@ async function packData(data, {getProcesses, getScripts, getCustoms}) { ...@@ -77,13 +77,18 @@ async function packData(data, {getProcesses, getScripts, getCustoms}) {
} }
} }
newData.customs = data.customs && data.customs.length > 0 ? await getCustoms(data.customs) : []; newData.customs = [];
if (data.customs && data.customs.length > 0) {
newData.customs = await getCustoms(data.customs).map(item => {
return JSON.parse(item);
});
}
return JSON.stringify(newData); return JSON.stringify(newData);
} }
function findDepPids(list, process) { function findDepPids(list, process) {
if(process.sub){ if (process.sub) {
for (let key in process.sub) { for (let key in process.sub) {
let p = process.sub[key]; let p = process.sub[key];
if (!list.includes(p.meta)) { if (!list.includes(p.meta)) {
......
This diff is collapsed.
...@@ -79,13 +79,18 @@ ...@@ -79,13 +79,18 @@
} }
} }
newData.customs = data.customs && data.customs.length > 0 ? await getCustoms(data.customs) : []; newData.customs = [];
if (data.customs && data.customs.length > 0) {
newData.customs = await getCustoms(data.customs).map(item => {
return JSON.parse(item);
});
}
return JSON.stringify(newData); return JSON.stringify(newData);
} }
function findDepPids(list, process) { function findDepPids(list, process) {
if(process.sub){ if (process.sub) {
for (let key in process.sub) { for (let key in process.sub) {
let p = process.sub[key]; let p = process.sub[key];
if (!list.includes(p.meta)) { if (!list.includes(p.meta)) {
......
This diff is collapsed.
...@@ -73,13 +73,18 @@ async function packData(data, {getProcesses, getScripts, getCustoms}) { ...@@ -73,13 +73,18 @@ async function packData(data, {getProcesses, getScripts, getCustoms}) {
} }
} }
newData.customs = data.customs && data.customs.length > 0 ? await getCustoms(data.customs) : []; newData.customs = [];
if (data.customs && data.customs.length > 0) {
newData.customs = await getCustoms(data.customs).map(item => {
return JSON.parse(item);
})
}
return JSON.stringify(newData); return JSON.stringify(newData);
} }
function findDepPids(list, process) { function findDepPids(list, process) {
if(process.sub){ if (process.sub) {
for (let key in process.sub) { for (let key in process.sub) {
let p = process.sub[key]; let p = process.sub[key];
if (!list.includes(p.meta)) { if (!list.includes(p.meta)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment