@luck-design-biz/luckda 1.0.2-20temp3 → 1.0.2-20temp4
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.
|
@@ -68,8 +68,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
|
|
|
68
68
|
var formPreset = uiSettings && uiSettings.form && uiSettings.form[0] && uiSettings.form[0].preset ? JSON.parse(uiSettings.form[0].preset) : {};
|
|
69
69
|
var basicItems = function () {
|
|
70
70
|
var fieldsObj = keyBy(fields, 'field');
|
|
71
|
-
var mergedArray = mergeAndSort(columns, formPreset.formFieldPreset || [], '
|
|
72
|
-
var columnsObj = keyBy(mergedArray, '
|
|
71
|
+
var mergedArray = mergeAndSort(columns, formPreset.formFieldPreset || [], 'aliaName');
|
|
72
|
+
var columnsObj = keyBy(mergedArray, 'aliaName');
|
|
73
73
|
var keys = isEmpty(fields) ? Object.keys(columnsObj) : union(Object.keys(fieldsObj), Object.keys(columnsObj));
|
|
74
74
|
var _defaultValues = {};
|
|
75
75
|
var _nodes = reduce(keys, function (result, key) {
|
|
@@ -76,8 +76,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
|
|
|
76
76
|
var formPreset = uiSettings && uiSettings.form && uiSettings.form[0] && uiSettings.form[0].preset ? JSON.parse(uiSettings.form[0].preset) : {};
|
|
77
77
|
var basicItems = function () {
|
|
78
78
|
var fieldsObj = (0, _lodash.keyBy)(fields, 'field');
|
|
79
|
-
var mergedArray = (0, _utils.mergeAndSort)(columns, formPreset.formFieldPreset || [], '
|
|
80
|
-
var columnsObj = (0, _lodash.keyBy)(mergedArray, '
|
|
79
|
+
var mergedArray = (0, _utils.mergeAndSort)(columns, formPreset.formFieldPreset || [], 'aliaName');
|
|
80
|
+
var columnsObj = (0, _lodash.keyBy)(mergedArray, 'aliaName');
|
|
81
81
|
var keys = (0, _lodash.isEmpty)(fields) ? Object.keys(columnsObj) : (0, _lodash.union)(Object.keys(fieldsObj), Object.keys(columnsObj));
|
|
82
82
|
var _defaultValues = {};
|
|
83
83
|
var _nodes = (0, _lodash.reduce)(keys, function (result, key) {
|
package/package.json
CHANGED