@luck-design-biz/luckda 1.0.7-1 → 1.0.7-3
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/es/helper/FromItems.js +6 -2
- package/es/helper/action.js +5 -2
- package/lib/helper/FromItems.js +6 -2
- package/lib/helper/action.js +4 -1
- package/package.json +1 -1
package/es/helper/FromItems.js
CHANGED
|
@@ -13,7 +13,7 @@ var _excluded = ["onBlur"],
|
|
|
13
13
|
_excluded8 = ["handleValueChange", "config"],
|
|
14
14
|
_excluded9 = ["handleValueChange", "onChange", "params", "extraFilter"],
|
|
15
15
|
_excluded10 = ["onChange"],
|
|
16
|
-
_excluded11 = ["handleValueChange", "config"],
|
|
16
|
+
_excluded11 = ["handleValueChange", "config", "allowClear"],
|
|
17
17
|
_excluded12 = ["onChange"],
|
|
18
18
|
_excluded13 = ["handleValueChange", "config", "allowClear"],
|
|
19
19
|
_excluded14 = ["renderInfoMode"],
|
|
@@ -197,8 +197,11 @@ export var getSelectItem = function getSelectItem(_ref11) {
|
|
|
197
197
|
_ref11$config2 = _ref11$config === void 0 ? {} : _ref11$config,
|
|
198
198
|
_onChange3 = _ref11$config2.onChange,
|
|
199
199
|
_config = _objectWithoutProperties(_ref11$config2, _excluded10),
|
|
200
|
+
_ref11$allowClear = _ref11.allowClear,
|
|
201
|
+
allowClear = _ref11$allowClear === void 0 ? true : _ref11$allowClear,
|
|
200
202
|
props = _objectWithoutProperties(_ref11, _excluded11);
|
|
201
203
|
var config = _objectSpread(_objectSpread({}, _config), {}, {
|
|
204
|
+
allowClear: allowClear,
|
|
202
205
|
onChange: function onChange(value, e) {
|
|
203
206
|
handleValueChange && handleValueChange(value);
|
|
204
207
|
_onChange3 && _onChange3(value, e);
|
|
@@ -223,7 +226,8 @@ export var getDictItem = function getDictItem(_ref14) {
|
|
|
223
226
|
_ref14$config2 = _ref14$config === void 0 ? {} : _ref14$config,
|
|
224
227
|
_onChange4 = _ref14$config2.onChange,
|
|
225
228
|
_config = _objectWithoutProperties(_ref14$config2, _excluded12),
|
|
226
|
-
allowClear = _ref14.allowClear,
|
|
229
|
+
_ref14$allowClear = _ref14.allowClear,
|
|
230
|
+
allowClear = _ref14$allowClear === void 0 ? true : _ref14$allowClear,
|
|
227
231
|
props = _objectWithoutProperties(_ref14, _excluded13);
|
|
228
232
|
var config = _objectSpread(_objectSpread({}, _config), {}, {
|
|
229
233
|
allowClear: allowClear,
|
package/es/helper/action.js
CHANGED
|
@@ -3,7 +3,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
|
3
3
|
// 通用方法
|
|
4
4
|
import { Modal } from 'luck-design/antd';
|
|
5
5
|
import { showPop, formatMessage } from '@luck-design-biz/base/utils';
|
|
6
|
-
import { transform, isArray, startsWith, keyBy } from 'lodash';
|
|
6
|
+
import { transform, isArray, startsWith, keyBy, keys } from 'lodash';
|
|
7
7
|
import { dataFormat, behaviorCall } from "../utils";
|
|
8
8
|
import { defaultComName } from "./form";
|
|
9
9
|
|
|
@@ -139,9 +139,12 @@ export var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
|
|
|
139
139
|
var formInfo = keyBy(formList, 'id')[key];
|
|
140
140
|
if (formInfo.type === 'auto') {
|
|
141
141
|
var _values$key;
|
|
142
|
-
|
|
142
|
+
var tempValues = _objectSpread(_objectSpread({}, result[formInfo.dataSetKey] || {}), {}, {
|
|
143
143
|
indocno: mainDataSetKey === formInfo.dataSetKey && action === 'add' && !window.appConfig.suppressUid ? formUid : formData[key] && formData[key][window.appConfig.constraintKeys.PRIMARY]
|
|
144
144
|
}, dataFormat(dataSets[formInfo.dataSetKey], (_values$key = values[key]) === null || _values$key === void 0 ? void 0 : _values$key.submitData));
|
|
145
|
+
result[formInfo.dataSetKey] = _objectSpread(_objectSpread({}, tempValues), {}, {
|
|
146
|
+
updColumns: keys(tempValues).join(',')
|
|
147
|
+
});
|
|
145
148
|
} else if (formInfo.type === 'grid' || formInfo.type === 'writer') {
|
|
146
149
|
var gridColumns = dataSets[formInfo.dataSetKey].map(function (col) {
|
|
147
150
|
if ((col.comName || defaultComName[col.property]) === 'radio') return _objectSpread(_objectSpread({}, col), {}, {
|
package/lib/helper/FromItems.js
CHANGED
|
@@ -30,7 +30,7 @@ var _excluded = ["onBlur"],
|
|
|
30
30
|
_excluded8 = ["handleValueChange", "config"],
|
|
31
31
|
_excluded9 = ["handleValueChange", "onChange", "params", "extraFilter"],
|
|
32
32
|
_excluded10 = ["onChange"],
|
|
33
|
-
_excluded11 = ["handleValueChange", "config"],
|
|
33
|
+
_excluded11 = ["handleValueChange", "config", "allowClear"],
|
|
34
34
|
_excluded12 = ["onChange"],
|
|
35
35
|
_excluded13 = ["handleValueChange", "config", "allowClear"],
|
|
36
36
|
_excluded14 = ["renderInfoMode"],
|
|
@@ -205,8 +205,11 @@ var getSelectItem = exports.getSelectItem = function getSelectItem(_ref11) {
|
|
|
205
205
|
_ref11$config2 = _ref11$config === void 0 ? {} : _ref11$config,
|
|
206
206
|
_onChange3 = _ref11$config2.onChange,
|
|
207
207
|
_config = (0, _objectWithoutProperties2.default)(_ref11$config2, _excluded10),
|
|
208
|
+
_ref11$allowClear = _ref11.allowClear,
|
|
209
|
+
allowClear = _ref11$allowClear === void 0 ? true : _ref11$allowClear,
|
|
208
210
|
props = (0, _objectWithoutProperties2.default)(_ref11, _excluded11);
|
|
209
211
|
var config = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _config), {}, {
|
|
212
|
+
allowClear: allowClear,
|
|
210
213
|
onChange: function onChange(value, e) {
|
|
211
214
|
handleValueChange && handleValueChange(value);
|
|
212
215
|
_onChange3 && _onChange3(value, e);
|
|
@@ -231,7 +234,8 @@ var getDictItem = exports.getDictItem = function getDictItem(_ref14) {
|
|
|
231
234
|
_ref14$config2 = _ref14$config === void 0 ? {} : _ref14$config,
|
|
232
235
|
_onChange4 = _ref14$config2.onChange,
|
|
233
236
|
_config = (0, _objectWithoutProperties2.default)(_ref14$config2, _excluded12),
|
|
234
|
-
allowClear = _ref14.allowClear,
|
|
237
|
+
_ref14$allowClear = _ref14.allowClear,
|
|
238
|
+
allowClear = _ref14$allowClear === void 0 ? true : _ref14$allowClear,
|
|
235
239
|
props = (0, _objectWithoutProperties2.default)(_ref14, _excluded13);
|
|
236
240
|
var config = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _config), {}, {
|
|
237
241
|
allowClear: allowClear,
|
package/lib/helper/action.js
CHANGED
|
@@ -146,9 +146,12 @@ var onBatchSubmitAction = exports.onBatchSubmitAction = function onBatchSubmitAc
|
|
|
146
146
|
var formInfo = (0, _lodash.keyBy)(formList, 'id')[key];
|
|
147
147
|
if (formInfo.type === 'auto') {
|
|
148
148
|
var _values$key;
|
|
149
|
-
|
|
149
|
+
var tempValues = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, result[formInfo.dataSetKey] || {}), {}, {
|
|
150
150
|
indocno: mainDataSetKey === formInfo.dataSetKey && action === 'add' && !window.appConfig.suppressUid ? formUid : formData[key] && formData[key][window.appConfig.constraintKeys.PRIMARY]
|
|
151
151
|
}, (0, _utils2.dataFormat)(dataSets[formInfo.dataSetKey], (_values$key = values[key]) === null || _values$key === void 0 ? void 0 : _values$key.submitData));
|
|
152
|
+
result[formInfo.dataSetKey] = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, tempValues), {}, {
|
|
153
|
+
updColumns: (0, _lodash.keys)(tempValues).join(',')
|
|
154
|
+
});
|
|
152
155
|
} else if (formInfo.type === 'grid' || formInfo.type === 'writer') {
|
|
153
156
|
var gridColumns = dataSets[formInfo.dataSetKey].map(function (col) {
|
|
154
157
|
if ((col.comName || _form.defaultComName[col.property]) === 'radio') return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, col), {}, {
|