mod-build 3.6.41-beta.3 → 3.6.41-beta.5
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/gulp-tasks/templates.js +14 -14
- package/package.json +1 -1
package/gulp-tasks/templates.js
CHANGED
|
@@ -172,19 +172,20 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
|
|
|
172
172
|
return steps;
|
|
173
173
|
}
|
|
174
174
|
steps.items.forEach(item => {
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
field
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
175
|
+
if (item.fields) {
|
|
176
|
+
item.fields = item.fields.map(field => {
|
|
177
|
+
if (field.name && defaultConfig[field.name]) {
|
|
178
|
+
field = Object.assign(defaultConfig[field.name], field);
|
|
179
|
+
}
|
|
180
|
+
return field;
|
|
181
|
+
});
|
|
182
|
+
}
|
|
181
183
|
});
|
|
182
184
|
|
|
183
185
|
return steps;
|
|
184
186
|
};
|
|
185
187
|
|
|
186
188
|
var getDefaultFormFieldConfig = async function() {
|
|
187
|
-
const siteData = templatesData;
|
|
188
189
|
await new Promise((resolve) => {
|
|
189
190
|
request(`https://${siteSettings.nodeEnv}/quote/resources/mod-site/shared-components/steps/defaultFormFieldConfig.json`, async function(err, xhr, response) {
|
|
190
191
|
if (xhr.statusCode !== 200) {
|
|
@@ -193,20 +194,19 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
|
|
|
193
194
|
|
|
194
195
|
const defaultConfig = await JSON.parse(response);
|
|
195
196
|
|
|
196
|
-
if (
|
|
197
|
-
|
|
197
|
+
if (templatesData.steps) {
|
|
198
|
+
templatesData.steps = await mergeDefaultFormFieldConfig(templatesData.steps, defaultConfig)
|
|
198
199
|
}
|
|
199
|
-
if (
|
|
200
|
-
|
|
200
|
+
if (templatesData.qsSteps) {
|
|
201
|
+
templatesData.qsSteps = await mergeDefaultFormFieldConfig(templatesData.qsSteps, defaultConfig)
|
|
201
202
|
}
|
|
202
|
-
if (
|
|
203
|
-
|
|
203
|
+
if (templatesData.modSteps) {
|
|
204
|
+
templatesData.modSteps = await mergeDefaultFormFieldConfig(templatesData.modSteps, defaultConfig)
|
|
204
205
|
}
|
|
205
206
|
|
|
206
207
|
resolve();
|
|
207
208
|
})
|
|
208
209
|
});
|
|
209
|
-
return siteData;
|
|
210
210
|
};
|
|
211
211
|
|
|
212
212
|
return async function() {
|