mod-build 3.6.61-beta.6 → 3.6.61-beta.7
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 +10 -6
- package/package.json +1 -1
package/gulp-tasks/templates.js
CHANGED
|
@@ -167,7 +167,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
|
|
|
167
167
|
}
|
|
168
168
|
];
|
|
169
169
|
|
|
170
|
-
var mergeDefaultFormFieldConfig = function(steps, defaultConfig) {
|
|
170
|
+
var mergeDefaultFormFieldConfig = function(steps, defaultConfig, folder) {
|
|
171
171
|
if (!steps.items) {
|
|
172
172
|
console.error('No items[ ] found in steps{}!');
|
|
173
173
|
return steps;
|
|
@@ -175,9 +175,12 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
|
|
|
175
175
|
steps.items.forEach(item => {
|
|
176
176
|
if (item.fields) {
|
|
177
177
|
item.fields = item.fields.map(field => {
|
|
178
|
-
if (field.name && defaultConfig[field.name]) {
|
|
178
|
+
if (folder === 'shared-components' && field.name && defaultConfig[field.name]) {
|
|
179
179
|
field = Object.assign(defaultConfig[field.name], field);
|
|
180
180
|
}
|
|
181
|
+
if (folder === 'accessible-components' && field.attributes && field.attributes.name && defaultConfig[field.attributes.name]) {
|
|
182
|
+
field = merge(defaultConfig[field.attributes.name], field);
|
|
183
|
+
}
|
|
181
184
|
return field;
|
|
182
185
|
});
|
|
183
186
|
}
|
|
@@ -196,15 +199,16 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
|
|
|
196
199
|
}
|
|
197
200
|
|
|
198
201
|
const defaultConfig = await JSON.parse(response);
|
|
202
|
+
console.log(defaultConfig)
|
|
199
203
|
|
|
200
204
|
if (templatesData.steps) {
|
|
201
|
-
templatesData.steps = await mergeDefaultFormFieldConfig(templatesData.steps, defaultConfig);
|
|
205
|
+
templatesData.steps = await mergeDefaultFormFieldConfig(templatesData.steps, defaultConfig, folder);
|
|
202
206
|
}
|
|
203
207
|
if (templatesData.qsSteps) {
|
|
204
|
-
templatesData.qsSteps = await mergeDefaultFormFieldConfig(templatesData.qsSteps, defaultConfig);
|
|
208
|
+
templatesData.qsSteps = await mergeDefaultFormFieldConfig(templatesData.qsSteps, defaultConfig, folder);
|
|
205
209
|
}
|
|
206
210
|
if (templatesData.modSteps) {
|
|
207
|
-
templatesData.modSteps = await mergeDefaultFormFieldConfig(templatesData.modSteps, defaultConfig);
|
|
211
|
+
templatesData.modSteps = await mergeDefaultFormFieldConfig(templatesData.modSteps, defaultConfig, folder);
|
|
208
212
|
}
|
|
209
213
|
|
|
210
214
|
templatesData.defaultConfigCompleted = true;
|
|
@@ -266,4 +270,4 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
|
|
|
266
270
|
}))
|
|
267
271
|
.pipe(gulp.dest(siteSettings.tmpFolder));
|
|
268
272
|
};
|
|
269
|
-
};
|
|
273
|
+
};
|