@luck-design-biz/luckda 0.0.13-2 → 0.0.14

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 (13) hide show
  1. package/es/components/LdAutoForm/index.js +3 -3
  2. package/es/components/LdGrid/index.js +1 -1
  3. package/es/components/LdGridForm/index.js +2 -2
  4. package/es/components/LdInfoPanel/index.js +2 -2
  5. package/es/helper/form.js +1 -1
  6. package/es/utils/grid.js +7 -7
  7. package/lib/components/LdAutoForm/index.js +3 -3
  8. package/lib/components/LdGrid/index.js +1 -1
  9. package/lib/components/LdGridForm/index.js +2 -2
  10. package/lib/components/LdInfoPanel/index.js +2 -2
  11. package/lib/helper/form.js +1 -1
  12. package/lib/utils/grid.js +7 -7
  13. package/package.json +1 -1
package/es/components/LdAutoForm/index.js CHANGED
@@ -53,15 +53,15 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
53
53
  if (col.isShowInForm) {
54
54
  var _objectSpread2;
55
55
  var customFiled = filedsRewrite.find(function (field) {
56
- return field.name === col.field;
56
+ return field.name === col.aliaName;
57
57
  }) || {};
58
- _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, col.field, col['optDefaultValue']), _defineProperty(_objectSpread2, "".concat(col.field, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
58
+ _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, col.aliaName, col['optDefaultValue']), _defineProperty(_objectSpread2, "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
59
59
  result.push(getFormItem(col, _objectSpread(_objectSpread({
60
60
  formId: ldId,
61
61
  moduleCode: moduleCode
62
62
  }, customFiled), {}, {
63
63
  handleValueChange: function handleValueChange(value) {
64
- return onValueChange(_defineProperty({}, ldId, _defineProperty({}, col.field, value)));
64
+ return onValueChange(_defineProperty({}, ldId, _defineProperty({}, col.aliaName, value)));
65
65
  }
66
66
  })));
67
67
  }
package/es/components/LdGrid/index.js CHANGED
@@ -87,7 +87,7 @@ var LdGrid = function LdGrid(_ref) {
87
87
  */
88
88
  var _columns = useCreation(function () {
89
89
  if (columnsReset) return columnsReset;
90
- var defaultColumns = keyBy(columns, 'field');
90
+ var defaultColumns = keyBy(columns, 'aliaName');
91
91
  var customColumns = keyBy(columnsRewrite, 'field');
92
92
  var mergeFields = union(keys(defaultColumns), keys(customColumns));
93
93
  return transform(mergeFields, function (result, field) {
package/es/components/LdGridForm/index.js CHANGED
@@ -68,13 +68,13 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
68
68
  if (col.isShowInForm) {
69
69
  var _objectSpread2, _customColumn;
70
70
  var customColumn = columnsRewrite.find(function (column) {
71
- return column.field === col.field;
71
+ return column.field === col.aliaName;
72
72
  }) || {};
73
73
  if (col.isReadOnly) customColumn = _objectSpread(_objectSpread({}, customColumn), {}, {
74
74
  editable: false,
75
75
  mode: 'grid'
76
76
  });
77
- _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, col.field, col['optDefaultValue']), _defineProperty(_objectSpread2, "".concat(col.field, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
77
+ _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, col.aliaName, col['optDefaultValue']), _defineProperty(_objectSpread2, "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
78
78
  result.push(getFormColumn(type, col, _objectSpread(_objectSpread({}, customColumn), {}, {
79
79
  formItemRewrite: _objectSpread(_objectSpread({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
80
80
  moduleCode: moduleCode,
package/es/components/LdInfoPanel/index.js CHANGED
@@ -53,7 +53,7 @@ var LdInfoPanel = function LdInfoPanel(_ref) {
53
53
  var _columns = useCreation(function () {
54
54
  return customColumns ? customColumns.map(function (col) {
55
55
  var xCol = columns.find(function (column) {
56
- return column.field === col.dataIndex;
56
+ return column.aliaName === col.dataIndex;
57
57
  }) || {};
58
58
  return _objectSpread({
59
59
  title: xCol.fieldName
@@ -62,7 +62,7 @@ var LdInfoPanel = function LdInfoPanel(_ref) {
62
62
  if (item.isShowInForm) {
63
63
  result.push({
64
64
  title: item.fieldName,
65
- dataIndex: item.field
65
+ dataIndex: item.aliaName
66
66
  });
67
67
  }
68
68
  }, []);
package/es/helper/form.js CHANGED
@@ -58,7 +58,7 @@ export function translator() {
58
58
  props = _objectWithoutProperties(_ref, _excluded);
59
59
  var allConfig = _objectSpread(_objectSpread({}, props), JSON.parse(extra || '{}'));
60
60
  var _props = {
61
- name: allConfig.field,
61
+ name: allConfig.aliaName,
62
62
  label: allConfig.fieldName,
63
63
  config: {
64
64
  required: !!allConfig.isNotNull,
package/es/utils/grid.js CHANGED
@@ -80,7 +80,6 @@ export function getColumnRender(name, type) {
80
80
  return render;
81
81
  }
82
82
  export var getGridColumn = function getGridColumn() {
83
- var _props$config2;
84
83
  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
85
84
  comName = _ref.comName,
86
85
  property = _ref.property,
@@ -108,6 +107,11 @@ export var getGridColumn = function getGridColumn() {
108
107
  data.filter = filter;
109
108
  data.filterParams = filterParams;
110
109
  } else if (!isTreeGrid && !isVirtual) {
110
+ var _props$config2;
111
+ if ((_props.mode || ((_props$config2 = _props.config) === null || _props$config2 === void 0 ? void 0 : _props$config2.mode)) === 'multiple') {
112
+ data.filter = 'text';
113
+ return data;
114
+ }
111
115
  switch (comName || defaultComName[property]) {
112
116
  case 'switch':
113
117
  data.filter = 'select';
@@ -149,7 +153,6 @@ export var getGridColumn = function getGridColumn() {
149
153
  });
150
154
  },
151
155
  key: name,
152
- mode: _props.mode && ((_props$config2 = _props.config) === null || _props$config2 === void 0 ? void 0 : _props$config2.mode),
153
156
  filterOption: false
154
157
  };
155
158
  break;
@@ -157,7 +160,6 @@ export var getGridColumn = function getGridColumn() {
157
160
  case 'radio':
158
161
  data.filter = 'select';
159
162
  if (_props.alias) {
160
- var _props$config3;
161
163
  data.filterParams = {
162
164
  options: function options() {
163
165
  var _getDvaApp3, _getDvaApp3$_store;
@@ -168,8 +170,7 @@ export var getGridColumn = function getGridColumn() {
168
170
  }
169
171
  });
170
172
  },
171
- key: name,
172
- mode: _props.mode && ((_props$config3 = _props.config) === null || _props$config3 === void 0 ? void 0 : _props$config3.mode)
173
+ key: name
173
174
  };
174
175
  }
175
176
  break;
@@ -195,8 +196,7 @@ export var getGridColumn = function getGridColumn() {
195
196
  }
196
197
  });
197
198
  },
198
- key: name,
199
- mode: 'multiple'
199
+ key: name
200
200
  };
201
201
  break;
202
202
  default:
package/lib/components/LdAutoForm/index.js CHANGED
@@ -61,15 +61,15 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
61
61
  if (col.isShowInForm) {
62
62
  var _objectSpread2;
63
63
  var customFiled = filedsRewrite.find(function (field) {
64
- return field.name === col.field;
64
+ return field.name === col.aliaName;
65
65
  }) || {};
66
- _defaultValues = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, _defaultValues), {}, (_objectSpread2 = {}, (0, _defineProperty2.default)(_objectSpread2, col.field, col['optDefaultValue']), (0, _defineProperty2.default)(_objectSpread2, "".concat(col.field, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
66
+ _defaultValues = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, _defaultValues), {}, (_objectSpread2 = {}, (0, _defineProperty2.default)(_objectSpread2, col.aliaName, col['optDefaultValue']), (0, _defineProperty2.default)(_objectSpread2, "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
67
67
  result.push((0, _utils.getFormItem)(col, (0, _objectSpread3.default)((0, _objectSpread3.default)({
68
68
  formId: ldId,
69
69
  moduleCode: moduleCode
70
70
  }, customFiled), {}, {
71
71
  handleValueChange: function handleValueChange(value) {
72
- return onValueChange((0, _defineProperty2.default)({}, ldId, (0, _defineProperty2.default)({}, col.field, value)));
72
+ return onValueChange((0, _defineProperty2.default)({}, ldId, (0, _defineProperty2.default)({}, col.aliaName, value)));
73
73
  }
74
74
  })));
75
75
  }
package/lib/components/LdGrid/index.js CHANGED
@@ -95,7 +95,7 @@ var LdGrid = function LdGrid(_ref) {
95
95
  */
96
96
  var _columns = (0, _ahooks.useCreation)(function () {
97
97
  if (columnsReset) return columnsReset;
98
- var defaultColumns = (0, _lodash.keyBy)(columns, 'field');
98
+ var defaultColumns = (0, _lodash.keyBy)(columns, 'aliaName');
99
99
  var customColumns = (0, _lodash.keyBy)(columnsRewrite, 'field');
100
100
  var mergeFields = (0, _lodash.union)((0, _lodash.keys)(defaultColumns), (0, _lodash.keys)(customColumns));
101
101
  return (0, _lodash.transform)(mergeFields, function (result, field) {
package/lib/components/LdGridForm/index.js CHANGED
@@ -76,13 +76,13 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
76
76
  if (col.isShowInForm) {
77
77
  var _objectSpread2, _customColumn;
78
78
  var customColumn = columnsRewrite.find(function (column) {
79
- return column.field === col.field;
79
+ return column.field === col.aliaName;
80
80
  }) || {};
81
81
  if (col.isReadOnly) customColumn = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, customColumn), {}, {
82
82
  editable: false,
83
83
  mode: 'grid'
84
84
  });
85
- _defaultValues = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, _defaultValues), {}, (_objectSpread2 = {}, (0, _defineProperty2.default)(_objectSpread2, col.field, col['optDefaultValue']), (0, _defineProperty2.default)(_objectSpread2, "".concat(col.field, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
85
+ _defaultValues = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, _defaultValues), {}, (_objectSpread2 = {}, (0, _defineProperty2.default)(_objectSpread2, col.aliaName, col['optDefaultValue']), (0, _defineProperty2.default)(_objectSpread2, "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
86
86
  result.push((0, _utils.getFormColumn)(type, col, (0, _objectSpread4.default)((0, _objectSpread4.default)({}, customColumn), {}, {
87
87
  formItemRewrite: (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
88
88
  moduleCode: moduleCode,
package/lib/components/LdInfoPanel/index.js CHANGED
@@ -61,7 +61,7 @@ var LdInfoPanel = function LdInfoPanel(_ref) {
61
61
  var _columns = (0, _ahooks.useCreation)(function () {
62
62
  return customColumns ? customColumns.map(function (col) {
63
63
  var xCol = columns.find(function (column) {
64
- return column.field === col.dataIndex;
64
+ return column.aliaName === col.dataIndex;
65
65
  }) || {};
66
66
  return (0, _objectSpread2.default)({
67
67
  title: xCol.fieldName
@@ -70,7 +70,7 @@ var LdInfoPanel = function LdInfoPanel(_ref) {
70
70
  if (item.isShowInForm) {
71
71
  result.push({
72
72
  title: item.fieldName,
73
- dataIndex: item.field
73
+ dataIndex: item.aliaName
74
74
  });
75
75
  }
76
76
  }, []);
package/lib/helper/form.js CHANGED
@@ -69,7 +69,7 @@ function translator() {
69
69
  props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
70
70
  var allConfig = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), JSON.parse(extra || '{}'));
71
71
  var _props = {
72
- name: allConfig.field,
72
+ name: allConfig.aliaName,
73
73
  label: allConfig.fieldName,
74
74
  config: {
75
75
  required: !!allConfig.isNotNull,
package/lib/utils/grid.js CHANGED
@@ -87,7 +87,6 @@ function getColumnRender(name, type) {
87
87
  return render;
88
88
  }
89
89
  var getGridColumn = function getGridColumn() {
90
- var _props$config2;
91
90
  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
92
91
  comName = _ref.comName,
93
92
  property = _ref.property,
@@ -115,6 +114,11 @@ var getGridColumn = function getGridColumn() {
115
114
  data.filter = filter;
116
115
  data.filterParams = filterParams;
117
116
  } else if (!isTreeGrid && !isVirtual) {
117
+ var _props$config2;
118
+ if ((_props.mode || ((_props$config2 = _props.config) === null || _props$config2 === void 0 ? void 0 : _props$config2.mode)) === 'multiple') {
119
+ data.filter = 'text';
120
+ return data;
121
+ }
118
122
  switch (comName || _form.defaultComName[property]) {
119
123
  case 'switch':
120
124
  data.filter = 'select';
@@ -156,7 +160,6 @@ var getGridColumn = function getGridColumn() {
156
160
  });
157
161
  },
158
162
  key: name,
159
- mode: _props.mode && ((_props$config2 = _props.config) === null || _props$config2 === void 0 ? void 0 : _props$config2.mode),
160
163
  filterOption: false
161
164
  };
162
165
  break;
@@ -164,7 +167,6 @@ var getGridColumn = function getGridColumn() {
164
167
  case 'radio':
165
168
  data.filter = 'select';
166
169
  if (_props.alias) {
167
- var _props$config3;
168
170
  data.filterParams = {
169
171
  options: function options() {
170
172
  var _getDvaApp3, _getDvaApp3$_store;
@@ -175,8 +177,7 @@ var getGridColumn = function getGridColumn() {
175
177
  }
176
178
  });
177
179
  },
178
- key: name,
179
- mode: _props.mode && ((_props$config3 = _props.config) === null || _props$config3 === void 0 ? void 0 : _props$config3.mode)
180
+ key: name
180
181
  };
181
182
  }
182
183
  break;
@@ -202,8 +203,7 @@ var getGridColumn = function getGridColumn() {
202
203
  }
203
204
  });
204
205
  },
205
- key: name,
206
- mode: 'multiple'
206
+ key: name
207
207
  };
208
208
  break;
209
209
  default:
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@luck-design-biz/luckda",
3
- "version": "0.0.13-2",
3
+ "version": "0.0.14",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",