@luck-design-biz/luckda 0.0.12-7 → 0.0.12-8-test

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/LdFormList/index.js +5 -2
  2. package/es/helper/action.js +5 -3
  3. package/lib/components/LdFormList/index.js +5 -2
  4. package/lib/helper/action.js +5 -3
  5. package/package.json +1 -1
package/es/components/LdFormList/index.js CHANGED
@@ -92,7 +92,8 @@ var LdFormList = function LdFormList(_ref) {
92
92
  var handleBatchSubmit = function handleBatchSubmit(values, action) {
93
93
  var _ref6 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
94
94
  formCode = _ref6.formCode,
95
- formKey = _ref6.formKey;
95
+ formKey = _ref6.formKey,
96
+ formUid = _ref6.formUid;
96
97
  setSubmitLoading(true);
97
98
  onBatchSubmitAction({
98
99
  values: values,
@@ -103,7 +104,9 @@ var LdFormList = function LdFormList(_ref) {
103
104
  action: action,
104
105
  formData: props.formData,
105
106
  form_id: formKey,
106
- effcode: formCode
107
+ effcode: formCode,
108
+ formUid: formUid,
109
+ mainDataSetKey: mainDataSetKey
107
110
  }, function (success, mainKey, res) {
108
111
  setSubmitLoading(false);
109
112
  if (success) {
package/es/helper/action.js CHANGED
@@ -108,7 +108,9 @@ export var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
108
108
  action = _ref3.action,
109
109
  formData = _ref3.formData,
110
110
  form_id = _ref3.form_id,
111
- effcode = _ref3.effcode;
111
+ effcode = _ref3.effcode,
112
+ formUid = _ref3.formUid,
113
+ mainDataSetKey = _ref3.mainDataSetKey;
112
114
  var data = transform(formList, function (result, value) {
113
115
  var _values$value$id;
114
116
  if (values[value.id]) {
@@ -116,7 +118,7 @@ export var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
116
118
  switch (value.type) {
117
119
  case 'auto':
118
120
  result[_dataSetKey] = _objectSpread({
119
- indocno: formData[value.id] && formData[value.id][window.appConfig.constraintKeys.PRIMARY]
121
+ indocno: mainDataSetKey === _dataSetKey && action === 'add' && !window.appConfig.suppressUid ? formUid : formData[value.id] && formData[value.id][window.appConfig.constraintKeys.PRIMARY]
120
122
  }, dataFormat(dataSets[_dataSetKey], (_values$value$id = values[value.id]) === null || _values$value$id === void 0 ? void 0 : _values$value$id.submitData));
121
123
  break;
122
124
  case 'grid':
@@ -137,7 +139,7 @@ export var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
137
139
  } else {
138
140
  _submitData = transform(values[value.id], function (_result, _value, _key) {
139
141
  _result[_key] = _value.map(function (item) {
140
- return _objectSpread(_objectSpread({}, dataFormat(gridColumns, item)), {}, _defineProperty({}, window.appConfig.constraintKeys.PRIMARY, null));
142
+ return _objectSpread(_objectSpread({}, dataFormat(gridColumns, item)), {}, _defineProperty({}, window.appConfig.constraintKeys.PRIMARY, _key === 'addList' ? null : item[window.appConfig.constraintKeys.PRIMARY]));
141
143
  });
142
144
  }, {});
143
145
  }
package/lib/components/LdFormList/index.js CHANGED
@@ -99,7 +99,8 @@ var LdFormList = function LdFormList(_ref) {
99
99
  var handleBatchSubmit = function handleBatchSubmit(values, action) {
100
100
  var _ref6 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
101
101
  formCode = _ref6.formCode,
102
- formKey = _ref6.formKey;
102
+ formKey = _ref6.formKey,
103
+ formUid = _ref6.formUid;
103
104
  setSubmitLoading(true);
104
105
  (0, _action.onBatchSubmitAction)({
105
106
  values: values,
@@ -110,7 +111,9 @@ var LdFormList = function LdFormList(_ref) {
110
111
  action: action,
111
112
  formData: props.formData,
112
113
  form_id: formKey,
113
- effcode: formCode
114
+ effcode: formCode,
115
+ formUid: formUid,
116
+ mainDataSetKey: mainDataSetKey
114
117
  }, function (success, mainKey, res) {
115
118
  setSubmitLoading(false);
116
119
  if (success) {
package/lib/helper/action.js CHANGED
@@ -116,7 +116,9 @@ var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
116
116
  action = _ref3.action,
117
117
  formData = _ref3.formData,
118
118
  form_id = _ref3.form_id,
119
- effcode = _ref3.effcode;
119
+ effcode = _ref3.effcode,
120
+ formUid = _ref3.formUid,
121
+ mainDataSetKey = _ref3.mainDataSetKey;
120
122
  var data = (0, _lodash.transform)(formList, function (result, value) {
121
123
  var _values$value$id;
122
124
  if (values[value.id]) {
@@ -124,7 +126,7 @@ var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
124
126
  switch (value.type) {
125
127
  case 'auto':
126
128
  result[_dataSetKey] = (0, _objectSpread4.default)({
127
- indocno: formData[value.id] && formData[value.id][window.appConfig.constraintKeys.PRIMARY]
129
+ indocno: mainDataSetKey === _dataSetKey && action === 'add' && !window.appConfig.suppressUid ? formUid : formData[value.id] && formData[value.id][window.appConfig.constraintKeys.PRIMARY]
128
130
  }, (0, _utils2.dataFormat)(dataSets[_dataSetKey], (_values$value$id = values[value.id]) === null || _values$value$id === void 0 ? void 0 : _values$value$id.submitData));
129
131
  break;
130
132
  case 'grid':
@@ -145,7 +147,7 @@ var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
145
147
  } else {
146
148
  _submitData = (0, _lodash.transform)(values[value.id], function (_result, _value, _key) {
147
149
  _result[_key] = _value.map(function (item) {
148
- return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils2.dataFormat)(gridColumns, item)), {}, (0, _defineProperty2.default)({}, window.appConfig.constraintKeys.PRIMARY, null));
150
+ return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils2.dataFormat)(gridColumns, item)), {}, (0, _defineProperty2.default)({}, window.appConfig.constraintKeys.PRIMARY, _key === 'addList' ? null : item[window.appConfig.constraintKeys.PRIMARY]));
149
151
  });
150
152
  }, {});
151
153
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@luck-design-biz/luckda",
3
- "version": "0.0.12-7",
3
+ "version": "0.0.12-8-test",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",