@luck-design-biz/luckda 1.0.2-20temp4 → 1.0.2-20temp6

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.
Files changed (5) hide show
  1. package/es/components/LdAutoForm/index.js +9 -9
  2. package/es/helper/ldBuilder.js +5 -1
  3. package/lib/components/LdAutoForm/index.js +9 -9
  4. package/lib/helper/ldBuilder.js +5 -1
  5. package/package.json +1 -1
package/es/components/LdAutoForm/index.js CHANGED
@@ -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 || [], 'aliaName');
72
- var columnsObj = keyBy(mergedArray, 'aliaName');
71
+ var mergedArray = mergeAndSort(columns, formPreset.formFieldPreset || [], 'aliasName');
72
+ var columnsObj = keyBy(mergedArray, 'aliasName');
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) {
@@ -82,9 +82,9 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
82
82
  }));
83
83
  } else if (col !== null && col !== void 0 && col.isShowInForm && (isNil(setting) || setting !== null && setting !== void 0 && setting.isShow)) {
84
84
  var customFiled = filedsRewrite.find(function (_field) {
85
- return _field.name === col.aliaName;
85
+ return _field.name === col.aliasName;
86
86
  }) || {};
87
- _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, _defineProperty(_defineProperty({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
87
+ _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, _defineProperty(_defineProperty({}, col.aliasName, col['optDefaultValue']), "".concat(col.aliasName, "_virtual"), col['optDefaultValueCvt']));
88
88
  var defaultSet = ['col', 'row', 'note', 'tip', 'placeholder'];
89
89
  var newCol = _objectSpread(_objectSpread({}, col), {}, {
90
90
  setVerifyRules: setVerifyRules,
@@ -92,16 +92,16 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
92
92
  }, pick(setting, defaultSet));
93
93
  // 该字段配置的表单显示信息
94
94
  var colUiData = formPreset.formFieldPreset ? formPreset.formFieldPreset.find(function (c) {
95
- return c.field === col.field;
95
+ return c.aliasName === col.aliasName;
96
96
  }) : {};
97
97
  result.push(getFormItem(newCol, _objectSpread(_objectSpread({
98
98
  formId: ldId,
99
99
  moduleCode: moduleCode
100
100
  }, customFiled), {}, {
101
101
  handleValueChange: function handleValueChange(value) {
102
- return onValueChange(_defineProperty({}, ldId, _defineProperty({}, col.aliaName, value)));
102
+ return onValueChange(_defineProperty({}, ldId, _defineProperty({}, col.aliasName, value)));
103
103
  },
104
- setting: omit(setting, [].concat(defaultSet, ['uid', 'field']))
104
+ setting: omit(setting, [].concat(defaultSet, ['uid', 'field', 'aliasName']))
105
105
  }), colUiData));
106
106
  }
107
107
  return result;
@@ -118,7 +118,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
118
118
  formId: ldId,
119
119
  isMain: isMain,
120
120
  defaultDataSource: _objectSpread(_objectSpread({}, formItemDataFormat(columns.map(function (c) {
121
- return _objectSpread(_objectSpread({}, c), keyBy(fields, 'field')[c.field]);
121
+ return _objectSpread(_objectSpread({}, c), keyBy(fields, 'field')[c.aliasName]);
122
122
  }), defaultValues.current)), defaultDataSourceFormat(defaultValues.current)),
123
123
  col: formPreset.formCol
124
124
  };
@@ -168,7 +168,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
168
168
  }, onQuery), {}, {
169
169
  format: function format(data, res) {
170
170
  var formItemData = _objectSpread({}, formItemDataFormat(columns.map(function (c) {
171
- return _objectSpread(_objectSpread({}, c), keyBy(fields, 'field')[c.field]);
171
+ return _objectSpread(_objectSpread({}, c), keyBy(fields, 'field')[c.aliasName]);
172
172
  }), data));
173
173
  if (onQuery !== null && onQuery !== void 0 && onQuery.format) return onQuery.format(data, formItemData, res); // 以预设为主
174
174
  return formItemData;
package/es/helper/ldBuilder.js CHANGED
@@ -57,7 +57,11 @@ var builder = function builder(wrapped) {
57
57
  label: '数据集'
58
58
  }));
59
59
  var wrappedProps = _objectSpread(_objectSpread({}, props), {}, {
60
- columns: dataSets[dataSetKey],
60
+ columns: dataSets[dataSetKey].map(function (item) {
61
+ return _objectSpread(_objectSpread({}, item), {}, {
62
+ aliasName: item.aliaName
63
+ });
64
+ }),
61
65
  isTree: isTree,
62
66
  resources: resources,
63
67
  actions: actions,
package/lib/components/LdAutoForm/index.js CHANGED
@@ -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 || [], 'aliaName');
80
- var columnsObj = (0, _lodash.keyBy)(mergedArray, 'aliaName');
79
+ var mergedArray = (0, _utils.mergeAndSort)(columns, formPreset.formFieldPreset || [], 'aliasName');
80
+ var columnsObj = (0, _lodash.keyBy)(mergedArray, 'aliasName');
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) {
@@ -90,9 +90,9 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
90
90
  }));
91
91
  } else if (col !== null && col !== void 0 && col.isShowInForm && ((0, _lodash.isNil)(setting) || setting !== null && setting !== void 0 && setting.isShow)) {
92
92
  var customFiled = filedsRewrite.find(function (_field) {
93
- return _field.name === col.aliaName;
93
+ return _field.name === col.aliasName;
94
94
  }) || {};
95
- _defaultValues = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, _defaultValues), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
95
+ _defaultValues = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, _defaultValues), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)({}, col.aliasName, col['optDefaultValue']), "".concat(col.aliasName, "_virtual"), col['optDefaultValueCvt']));
96
96
  var defaultSet = ['col', 'row', 'note', 'tip', 'placeholder'];
97
97
  var newCol = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, col), {}, {
98
98
  setVerifyRules: setVerifyRules,
@@ -100,16 +100,16 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
100
100
  }, (0, _lodash.pick)(setting, defaultSet));
101
101
  // 该字段配置的表单显示信息
102
102
  var colUiData = formPreset.formFieldPreset ? formPreset.formFieldPreset.find(function (c) {
103
- return c.field === col.field;
103
+ return c.aliasName === col.aliasName;
104
104
  }) : {};
105
105
  result.push((0, _utils.getFormItem)(newCol, (0, _objectSpread3.default)((0, _objectSpread3.default)({
106
106
  formId: ldId,
107
107
  moduleCode: moduleCode
108
108
  }, customFiled), {}, {
109
109
  handleValueChange: function handleValueChange(value) {
110
- return onValueChange((0, _defineProperty2.default)({}, ldId, (0, _defineProperty2.default)({}, col.aliaName, value)));
110
+ return onValueChange((0, _defineProperty2.default)({}, ldId, (0, _defineProperty2.default)({}, col.aliasName, value)));
111
111
  },
112
- setting: (0, _lodash.omit)(setting, [].concat(defaultSet, ['uid', 'field']))
112
+ setting: (0, _lodash.omit)(setting, [].concat(defaultSet, ['uid', 'field', 'aliasName']))
113
113
  }), colUiData));
114
114
  }
115
115
  return result;
@@ -126,7 +126,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
126
126
  formId: ldId,
127
127
  isMain: isMain,
128
128
  defaultDataSource: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, (0, _utils.formItemDataFormat)(columns.map(function (c) {
129
- return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, c), (0, _lodash.keyBy)(fields, 'field')[c.field]);
129
+ return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, c), (0, _lodash.keyBy)(fields, 'field')[c.aliasName]);
130
130
  }), defaultValues.current)), defaultDataSourceFormat(defaultValues.current)),
131
131
  col: formPreset.formCol
132
132
  };
@@ -176,7 +176,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
176
176
  }, onQuery), {}, {
177
177
  format: function format(data, res) {
178
178
  var formItemData = (0, _objectSpread3.default)({}, (0, _utils.formItemDataFormat)(columns.map(function (c) {
179
- return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, c), (0, _lodash.keyBy)(fields, 'field')[c.field]);
179
+ return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, c), (0, _lodash.keyBy)(fields, 'field')[c.aliasName]);
180
180
  }), data));
181
181
  if (onQuery !== null && onQuery !== void 0 && onQuery.format) return onQuery.format(data, formItemData, res); // 以预设为主
182
182
  return formItemData;
package/lib/helper/ldBuilder.js CHANGED
@@ -64,7 +64,11 @@ var builder = function builder(wrapped) {
64
64
  label: '数据集'
65
65
  }));
66
66
  var wrappedProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
67
- columns: dataSets[dataSetKey],
67
+ columns: dataSets[dataSetKey].map(function (item) {
68
+ return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
69
+ aliasName: item.aliaName
70
+ });
71
+ }),
68
72
  isTree: isTree,
69
73
  resources: resources,
70
74
  actions: actions,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@luck-design-biz/luckda",
3
- "version": "1.0.2-20temp4",
3
+ "version": "1.0.2-20temp6",
4
4
  "description": "前端配置管理中心业务组件库",
5
5
  "scripts": {
6
6
  "start": "cross-env NODE_OPTIONS=--max-old-space-size=10240 USER_RUNTIME=SITE RUNTIME=dev umi dev",