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

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 +16 -13
  2. package/es/components/LdFormList/index.js +2 -7
  3. package/es/components/LdGridForm/index.js +9 -3
  4. package/es/helper/FromItems.js +1 -3
  5. package/es/helper/action.js +4 -3
  6. package/es/utils/form.js +1 -1
  7. package/lib/components/LdAutoForm/index.js +16 -13
  8. package/lib/components/LdFormList/index.js +2 -7
  9. package/lib/components/LdGridForm/index.js +22 -16
  10. package/lib/helper/FromItems.js +1 -3
  11. package/lib/helper/action.js +4 -3
  12. package/lib/utils/form.js +1 -1
  13. package/package.json +1 -1
package/es/components/LdAutoForm/index.js CHANGED
@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
2
2
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
3
3
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
4
4
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
5
- var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "formRef", "formMode", "formData"];
5
+ var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey"];
6
6
  import React, { createRef, useContext } from 'react';
7
7
  import { transform } from 'lodash';
8
8
  import { AutoForm } from '@luck-design-biz/base/FormList';
@@ -40,9 +40,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
40
40
  } : _ref$defaultDataSourc,
41
41
  _ref$ticketData = _ref.ticketData,
42
42
  ticketData = _ref$ticketData === void 0 ? {} : _ref$ticketData,
43
- formRef = _ref.formRef,
44
- formMode = _ref.formMode,
45
- forwardFormData = _ref.formData,
43
+ _ref$relationKey = _ref.relationKey,
44
+ relationKey = _ref$relationKey === void 0 ? window.appConfig.constraintKeys.PRIMARY : _ref$relationKey,
46
45
  props = _objectWithoutProperties(_ref, _excluded);
47
46
  var _ref2 = useContext(LuckDaContext) || {},
48
47
  setFieldProps = _ref2.setFieldProps;
@@ -59,10 +58,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
59
58
  _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, col.field, col['optDefaultValue']), _defineProperty(_objectSpread2, "".concat(col.field, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
60
59
  result.push(getFormItem(col, _objectSpread(_objectSpread({
61
60
  formId: ldId,
62
- moduleCode: moduleCode,
63
- formRef: formRef,
64
- formMode: formMode,
65
- uid: ticketData[window.appConfig.constraintKeys.PRIMARY]
61
+ moduleCode: moduleCode
66
62
  }, customFiled), {}, {
67
63
  handleValueChange: function handleValueChange(value) {
68
64
  return onValueChange(_defineProperty({}, ldId, _defineProperty({}, col.field, value)));
@@ -88,7 +84,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
88
84
  var behaviorKey = arguments.length > 1 ? arguments[1] : undefined;
89
85
  return _objectSpread(_objectSpread({
90
86
  api: function api(get, post, formData) {
91
- post[dataSetKey][isMain ? 'indocno' : 'relationId'] = formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY];
87
+ var _relationKey = isMain ? window.appConfig.constraintKeys.PRIMARY : relationKey;
88
+ post[dataSetKey].indocno = formData[mainFormLdId] && formData[mainFormLdId][_relationKey] || ticketData[_relationKey];
92
89
  return behaviorCall(get, post, formData);
93
90
  },
94
91
  get: function get() {
@@ -117,8 +114,13 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
117
114
  onQuery: _objectSpread(_objectSpread({
118
115
  api: behaviorCall,
119
116
  get: function get(formData) {
120
- var _params2;
121
- var _params = (_params2 = {}, _defineProperty(_params2, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY]), _defineProperty(_params2, "moduleCode", moduleCode), _defineProperty(_params2, "datasetCode", dataSetKey), _defineProperty(_params2, "behaviorKey", 'readForm'), _params2);
117
+ var _relationKey = isMain ? window.appConfig.constraintKeys.PRIMARY : relationKey;
118
+ var _params = {
119
+ indocno: formData[mainFormLdId] && formData[mainFormLdId][_relationKey] || ticketData[_relationKey],
120
+ moduleCode: moduleCode,
121
+ datasetCode: dataSetKey,
122
+ behaviorKey: 'readForm'
123
+ };
122
124
  if (!isMain) _params.relationDs = mainDataSetKey;
123
125
  return _params;
124
126
  }
@@ -128,8 +130,9 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
128
130
  if (onQuery === null || onQuery === void 0 ? void 0 : onQuery.format) return onQuery.format(data, formItemData, res); // 以预设为主
129
131
  return formItemData;
130
132
  }
131
- }),
132
- onAdd: onOperate(onAdd, 'add'),
133
+ })
134
+ // onAdd={onOperate(onAdd, 'add')}
135
+ ,
133
136
  onUpdate: onOperate(onUpdate, 'update'),
134
137
  operates: defaultOpe
135
138
  }, formConfig), basicItems);
package/es/components/LdFormList/index.js CHANGED
@@ -128,7 +128,8 @@ var LdFormList = function LdFormList(_ref) {
128
128
  // })}`,
129
129
  // );
130
130
  // } else {
131
- formListRef.current.onQuery(null, _defineProperty({}, mainFormLdId, _defineProperty({}, window.appConfig.constraintKeys.PRIMARY, mainKey)), function () {
131
+ var mainFormData = res.detail[res.list[0]];
132
+ formListRef.current.onQuery(null, _defineProperty({}, mainFormLdId, mainFormData), function () {
132
133
  return formListRef.current.setFormMode('info');
133
134
  });
134
135
  // }
@@ -203,9 +204,6 @@ var LdFormList = function LdFormList(_ref) {
203
204
  readOnly: readOnly || _readOnly,
204
205
  onValueChange: handleValueChange,
205
206
  ticketData: props.ticketData,
206
- formRef: formListRef,
207
- formMode: formMode,
208
- formData: props.formData,
209
207
  renderTopLeft: function renderTopLeft() {
210
208
  return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'text'), _renderTopLeft()];
211
209
  }
@@ -226,9 +224,6 @@ var LdFormList = function LdFormList(_ref) {
226
224
  readOnly: readOnly || _readOnly,
227
225
  onValueChange: handleValueChange,
228
226
  ticketData: props.ticketData,
229
- formRef: formListRef,
230
- formMode: formMode,
231
- formData: props.formData,
232
227
  renderTopLeft: function renderTopLeft() {
233
228
  return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'graphic'), _renderTopLeft()];
234
229
  }
package/es/components/LdGridForm/index.js CHANGED
@@ -108,7 +108,9 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
108
108
  var behaviorKey = arguments.length > 1 ? arguments[1] : undefined;
109
109
  return _objectSpread(_objectSpread({
110
110
  api: function api(get, post, formData) {
111
- return behaviorCall(_objectSpread(_objectSpread({}, get), {}, _defineProperty({}, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY])), post, formData);
111
+ return behaviorCall(_objectSpread(_objectSpread({}, get), {}, {
112
+ relationId: formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY]
113
+ }), post, formData);
112
114
  },
113
115
  get: function get() {
114
116
  var _get = {
@@ -140,8 +142,12 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
140
142
  onQuery: _objectSpread(_objectSpread({
141
143
  api: behaviorCall,
142
144
  get: function get(formData) {
143
- var _params2;
144
- var _params = (_params2 = {}, _defineProperty(_params2, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY]), _defineProperty(_params2, "moduleCode", moduleCode), _defineProperty(_params2, "datasetCode", dataSetKey), _defineProperty(_params2, "behaviorKey", 'readGrid'), _params2);
145
+ var _params = {
146
+ relationId: formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY],
147
+ moduleCode: moduleCode,
148
+ datasetCode: dataSetKey,
149
+ behaviorKey: 'readGrid'
150
+ };
145
151
  if (!isMain) _params.relationDs = mainDataSetKey;
146
152
  return _params;
147
153
  }
package/es/helper/FromItems.js CHANGED
@@ -24,7 +24,7 @@ var _excluded = ["onBlur"],
24
24
  _excluded20 = ["handleValueChange", "config"],
25
25
  _excluded21 = ["onBlur"],
26
26
  _excluded22 = ["handleValueChange", "config"],
27
- _excluded23 = ["onBlur", "uid"],
27
+ _excluded23 = ["onBlur"],
28
28
  _excluded24 = ["handleValueChange", "config"];
29
29
  import React, { useState, useEffect } from 'react';
30
30
  import { getDvaApp } from 'umi';
@@ -298,11 +298,9 @@ export var getUploadItem = function getUploadItem() {
298
298
  _ref14$config = _ref14.config,
299
299
  _ref14$config2 = _ref14$config === void 0 ? {} : _ref14$config,
300
300
  _onBlur5 = _ref14$config2.onBlur,
301
- uid = _ref14$config2.uid,
302
301
  _config = _objectWithoutProperties(_ref14$config2, _excluded23),
303
302
  props = _objectWithoutProperties(_ref14, _excluded24);
304
303
  return /*#__PURE__*/React.createElement(UploadFormItemV3, _extends({}, props, {
305
- docUid: props.uid,
306
304
  config: _objectSpread(_objectSpread({
307
305
  listType: 'picture-card',
308
306
  accept: 'image/*'
package/es/helper/action.js CHANGED
@@ -68,8 +68,8 @@ export var doAction = function doAction(action) {
68
68
  moduleCode: moduleCode
69
69
  }, get), post).then(function (res) {
70
70
  var code = res.code,
71
- _data = res.data;
72
- callback && callback(code === 1, _data, res);
71
+ list = res.list;
72
+ callback && callback(code === 1, list && list[0], res);
73
73
  if (code === 1 && showPopWhenSuccess) {
74
74
  showPop(formatMessage({
75
75
  id: 'app.base.tip.operate.success'
@@ -153,7 +153,8 @@ export var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
153
153
  doAction(action, {
154
154
  get: {
155
155
  form_id: form_id,
156
- effcode: effcode
156
+ effcode: effcode,
157
+ mainDataset: mainDataSetKey
157
158
  },
158
159
  post: backData
159
160
  }, {
package/es/utils/form.js CHANGED
@@ -30,7 +30,7 @@ export function getFormItem() {
30
30
  props = _objectWithoutProperties(_ref, _excluded);
31
31
  var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
32
32
  if (!property) return /*#__PURE__*/React.createElement(React.Fragment, null);
33
- if (property === 'sint') props.opt_decimal = 0;
33
+ if (property === 'sint' || property === 'number') props.opt_decimal = 0;
34
34
  var _translator = translator(props),
35
35
  name = _translator.name,
36
36
  translateProps = _objectWithoutProperties(_translator, _excluded2);
package/lib/components/LdAutoForm/index.js CHANGED
@@ -16,7 +16,7 @@ var _FormList = require("@luck-design-biz/base/FormList");
16
16
  var _ldBuilder = _interopRequireDefault(require("../../helper/ldBuilder"));
17
17
  var _utils = require("../../utils");
18
18
  var _Builder = require("../Builder");
19
- var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "formRef", "formMode", "formData"];
19
+ var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey"];
20
20
  var defaultOpe = ['read', 'add', 'update', 'delete'];
21
21
  var buildLdAutoForm = function buildLdAutoForm(_ref) {
22
22
  var _ref$columns = _ref.columns,
@@ -48,9 +48,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
48
48
  } : _ref$defaultDataSourc,
49
49
  _ref$ticketData = _ref.ticketData,
50
50
  ticketData = _ref$ticketData === void 0 ? {} : _ref$ticketData,
51
- formRef = _ref.formRef,
52
- formMode = _ref.formMode,
53
- forwardFormData = _ref.formData,
51
+ _ref$relationKey = _ref.relationKey,
52
+ relationKey = _ref$relationKey === void 0 ? window.appConfig.constraintKeys.PRIMARY : _ref$relationKey,
54
53
  props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
55
54
  var _ref2 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
56
55
  setFieldProps = _ref2.setFieldProps;
@@ -67,10 +66,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
67
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));
68
67
  result.push((0, _utils.getFormItem)(col, (0, _objectSpread3.default)((0, _objectSpread3.default)({
69
68
  formId: ldId,
70
- moduleCode: moduleCode,
71
- formRef: formRef,
72
- formMode: formMode,
73
- uid: ticketData[window.appConfig.constraintKeys.PRIMARY]
69
+ moduleCode: moduleCode
74
70
  }, customFiled), {}, {
75
71
  handleValueChange: function handleValueChange(value) {
76
72
  return onValueChange((0, _defineProperty2.default)({}, ldId, (0, _defineProperty2.default)({}, col.field, value)));
@@ -96,7 +92,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
96
92
  var behaviorKey = arguments.length > 1 ? arguments[1] : undefined;
97
93
  return (0, _objectSpread3.default)((0, _objectSpread3.default)({
98
94
  api: function api(get, post, formData) {
99
- post[dataSetKey][isMain ? 'indocno' : 'relationId'] = formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY];
95
+ var _relationKey = isMain ? window.appConfig.constraintKeys.PRIMARY : relationKey;
96
+ post[dataSetKey].indocno = formData[mainFormLdId] && formData[mainFormLdId][_relationKey] || ticketData[_relationKey];
100
97
  return (0, _utils.behaviorCall)(get, post, formData);
101
98
  },
102
99
  get: function get() {
@@ -125,8 +122,13 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
125
122
  onQuery: (0, _objectSpread3.default)((0, _objectSpread3.default)({
126
123
  api: _utils.behaviorCall,
127
124
  get: function get(formData) {
128
- var _params2;
129
- var _params = (_params2 = {}, (0, _defineProperty2.default)(_params2, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY]), (0, _defineProperty2.default)(_params2, "moduleCode", moduleCode), (0, _defineProperty2.default)(_params2, "datasetCode", dataSetKey), (0, _defineProperty2.default)(_params2, "behaviorKey", 'readForm'), _params2);
125
+ var _relationKey = isMain ? window.appConfig.constraintKeys.PRIMARY : relationKey;
126
+ var _params = {
127
+ indocno: formData[mainFormLdId] && formData[mainFormLdId][_relationKey] || ticketData[_relationKey],
128
+ moduleCode: moduleCode,
129
+ datasetCode: dataSetKey,
130
+ behaviorKey: 'readForm'
131
+ };
130
132
  if (!isMain) _params.relationDs = mainDataSetKey;
131
133
  return _params;
132
134
  }
@@ -136,8 +138,9 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
136
138
  if (onQuery === null || onQuery === void 0 ? void 0 : onQuery.format) return onQuery.format(data, formItemData, res); // 以预设为主
137
139
  return formItemData;
138
140
  }
139
- }),
140
- onAdd: onOperate(onAdd, 'add'),
141
+ })
142
+ // onAdd={onOperate(onAdd, 'add')}
143
+ ,
141
144
  onUpdate: onOperate(onUpdate, 'update'),
142
145
  operates: defaultOpe
143
146
  }, formConfig), basicItems);
package/lib/components/LdFormList/index.js CHANGED
@@ -135,7 +135,8 @@ var LdFormList = function LdFormList(_ref) {
135
135
  // })}`,
136
136
  // );
137
137
  // } else {
138
- formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, (0, _defineProperty2.default)({}, window.appConfig.constraintKeys.PRIMARY, mainKey)), function () {
138
+ var mainFormData = res.detail[res.list[0]];
139
+ formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, mainFormData), function () {
139
140
  return formListRef.current.setFormMode('info');
140
141
  });
141
142
  // }
@@ -210,9 +211,6 @@ var LdFormList = function LdFormList(_ref) {
210
211
  readOnly: readOnly || _readOnly,
211
212
  onValueChange: handleValueChange,
212
213
  ticketData: props.ticketData,
213
- formRef: formListRef,
214
- formMode: formMode,
215
- formData: props.formData,
216
214
  renderTopLeft: function renderTopLeft() {
217
215
  return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'text'), _renderTopLeft()];
218
216
  }
@@ -233,9 +231,6 @@ var LdFormList = function LdFormList(_ref) {
233
231
  readOnly: readOnly || _readOnly,
234
232
  onValueChange: handleValueChange,
235
233
  ticketData: props.ticketData,
236
- formRef: formListRef,
237
- formMode: formMode,
238
- formData: props.formData,
239
234
  renderTopLeft: function renderTopLeft() {
240
235
  return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'graphic'), _renderTopLeft()];
241
236
  }
package/lib/components/LdGridForm/index.js CHANGED
@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", {
8
8
  exports.default = void 0;
9
9
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
10
10
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
11
- var _objectSpread5 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
11
+ var _objectSpread4 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
12
12
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
13
13
  var _react = _interopRequireWildcard(require("react"));
14
14
  var _lodash = require("lodash");
@@ -65,7 +65,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
65
65
  var defaultValues = /*#__PURE__*/(0, _react.createRef)();
66
66
  var isMain = ldId === mainFormLdId;
67
67
  var gridColumns = columns.map(function (col) {
68
- if ((col.comName || _form.defaultComName[col.property]) === 'radio') return (0, _objectSpread5.default)((0, _objectSpread5.default)({}, col), {}, {
68
+ if ((col.comName || _form.defaultComName[col.property]) === 'radio') return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, col), {}, {
69
69
  comName: 'select'
70
70
  });
71
71
  return col;
@@ -78,13 +78,13 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
78
78
  var customColumn = columnsRewrite.find(function (column) {
79
79
  return column.field === col.field;
80
80
  }) || {};
81
- if (col.isReadOnly) customColumn = (0, _objectSpread5.default)((0, _objectSpread5.default)({}, customColumn), {}, {
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, _objectSpread5.default)((0, _objectSpread5.default)({}, _defaultValues), {}, (_objectSpread2 = {}, (0, _defineProperty2.default)(_objectSpread2, col.field, col['optDefaultValue']), (0, _defineProperty2.default)(_objectSpread2, "".concat(col.field, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
86
- result.push((0, _utils.getFormColumn)(type, col, (0, _objectSpread5.default)((0, _objectSpread5.default)({}, customColumn), {}, {
87
- formItemRewrite: (0, _objectSpread5.default)((0, _objectSpread5.default)({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
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));
86
+ result.push((0, _utils.getFormColumn)(type, col, (0, _objectSpread4.default)((0, _objectSpread4.default)({}, customColumn), {}, {
87
+ formItemRewrite: (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
88
88
  moduleCode: moduleCode,
89
89
  formRef: formRef,
90
90
  formMode: formMode
@@ -96,15 +96,15 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
96
96
  setFieldProps((0, _defineProperty2.default)({}, ldId, _nodes.map(function (col) {
97
97
  var node = col.renderBasicFormItem();
98
98
  var renderBasicFormItem = node === null || node === void 0 ? void 0 : node.props;
99
- return (0, _objectSpread5.default)((0, _objectSpread5.default)({}, col), {}, {
100
- renderBasicFormItem: (0, _objectSpread5.default)({
99
+ return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, col), {}, {
100
+ renderBasicFormItem: (0, _objectSpread4.default)({
101
101
  component: node.type.comName || node.type.displayName
102
102
  }, renderBasicFormItem)
103
103
  });
104
104
  })));
105
105
  return _nodes;
106
106
  }();
107
- var defaultDataSource = (0, _objectSpread5.default)((0, _objectSpread5.default)({}, (0, _utils.formItemDataFormat)(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current));
107
+ var defaultDataSource = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils.formItemDataFormat)(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current));
108
108
  var formConfig = {
109
109
  formId: ldId,
110
110
  columns: _columns,
@@ -114,9 +114,11 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
114
114
  var onOperate = function onOperate() {
115
115
  var _onOperate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
116
116
  var behaviorKey = arguments.length > 1 ? arguments[1] : undefined;
117
- return (0, _objectSpread5.default)((0, _objectSpread5.default)({
117
+ return (0, _objectSpread4.default)((0, _objectSpread4.default)({
118
118
  api: function api(get, post, formData) {
119
- return (0, _utils.behaviorCall)((0, _objectSpread5.default)((0, _objectSpread5.default)({}, get), {}, (0, _defineProperty2.default)({}, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY])), post, formData);
119
+ return (0, _utils.behaviorCall)((0, _objectSpread4.default)((0, _objectSpread4.default)({}, get), {}, {
120
+ relationId: formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY]
121
+ }), post, formData);
120
122
  },
121
123
  get: function get() {
122
124
  var _get = {
@@ -130,7 +132,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
130
132
  }, _onOperate), {}, {
131
133
  post: function post(data) {
132
134
  var _submitData = data.map(function (item) {
133
- return behaviorKey === 'add' ? (0, _objectSpread5.default)((0, _objectSpread5.default)({}, (0, _utils.dataFormat)(gridColumns, item)), {}, (0, _defineProperty2.default)({}, window.appConfig.constraintKeys.PRIMARY, null)) : (0, _utils.dataFormat)(gridColumns, item);
135
+ return behaviorKey === 'add' ? (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils.dataFormat)(gridColumns, item)), {}, (0, _defineProperty2.default)({}, window.appConfig.constraintKeys.PRIMARY, null)) : (0, _utils.dataFormat)(gridColumns, item);
134
136
  });
135
137
  if (_onOperate === null || _onOperate === void 0 ? void 0 : _onOperate.post) return _onOperate.post(_submitData); // 以预设为主
136
138
  return (0, _defineProperty2.default)({}, dataSetKey, (0, _defineProperty2.default)({}, "".concat(behaviorKey, "List"), _submitData));
@@ -145,11 +147,15 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
145
147
  type: type,
146
148
  rowKey: window.appConfig.constraintKeys.PRIMARY || 'indocno'
147
149
  }, props, {
148
- onQuery: (0, _objectSpread5.default)((0, _objectSpread5.default)({
150
+ onQuery: (0, _objectSpread4.default)((0, _objectSpread4.default)({
149
151
  api: _utils.behaviorCall,
150
152
  get: function get(formData) {
151
- var _params2;
152
- var _params = (_params2 = {}, (0, _defineProperty2.default)(_params2, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY]), (0, _defineProperty2.default)(_params2, "moduleCode", moduleCode), (0, _defineProperty2.default)(_params2, "datasetCode", dataSetKey), (0, _defineProperty2.default)(_params2, "behaviorKey", 'readGrid'), _params2);
153
+ var _params = {
154
+ relationId: formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY],
155
+ moduleCode: moduleCode,
156
+ datasetCode: dataSetKey,
157
+ behaviorKey: 'readGrid'
158
+ };
153
159
  if (!isMain) _params.relationDs = mainDataSetKey;
154
160
  return _params;
155
161
  }
@@ -164,7 +170,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
164
170
  }),
165
171
  onAdd: onOperate(onAdd, 'add'),
166
172
  onUpdate: onOperate(onUpdate, 'update'),
167
- onDelete: (0, _objectSpread5.default)((0, _objectSpread5.default)({}, onOperate(onDelete, 'delete')), {}, {
173
+ onDelete: (0, _objectSpread4.default)((0, _objectSpread4.default)({}, onOperate(onDelete, 'delete')), {}, {
168
174
  post: function post(data) {
169
175
  var _submitData = data.map(function (item) {
170
176
  return {
package/lib/helper/FromItems.js CHANGED
@@ -37,7 +37,7 @@ var _excluded = ["onBlur"],
37
37
  _excluded20 = ["handleValueChange", "config"],
38
38
  _excluded21 = ["onBlur"],
39
39
  _excluded22 = ["handleValueChange", "config"],
40
- _excluded23 = ["onBlur", "uid"],
40
+ _excluded23 = ["onBlur"],
41
41
  _excluded24 = ["handleValueChange", "config"];
42
42
  var getNumberItem = function getNumberItem() {
43
43
  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
@@ -319,11 +319,9 @@ var getUploadItem = function getUploadItem() {
319
319
  _ref14$config = _ref14.config,
320
320
  _ref14$config2 = _ref14$config === void 0 ? {} : _ref14$config,
321
321
  _onBlur5 = _ref14$config2.onBlur,
322
- uid = _ref14$config2.uid,
323
322
  _config = (0, _objectWithoutProperties2.default)(_ref14$config2, _excluded23),
324
323
  props = (0, _objectWithoutProperties2.default)(_ref14, _excluded24);
325
324
  return /*#__PURE__*/_react.default.createElement(_base.UploadFormItemV3, (0, _extends2.default)({}, props, {
326
- docUid: props.uid,
327
325
  config: (0, _objectSpread2.default)((0, _objectSpread2.default)({
328
326
  listType: 'picture-card',
329
327
  accept: 'image/*'
package/lib/helper/action.js CHANGED
@@ -75,8 +75,8 @@ var doAction = function doAction(action) {
75
75
  moduleCode: moduleCode
76
76
  }, get), post).then(function (res) {
77
77
  var code = res.code,
78
- _data = res.data;
79
- callback && callback(code === 1, _data, res);
78
+ list = res.list;
79
+ callback && callback(code === 1, list && list[0], res);
80
80
  if (code === 1 && showPopWhenSuccess) {
81
81
  (0, _utils.showPop)((0, _utils.formatMessage)({
82
82
  id: 'app.base.tip.operate.success'
@@ -161,7 +161,8 @@ var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
161
161
  doAction(action, {
162
162
  get: {
163
163
  form_id: form_id,
164
- effcode: effcode
164
+ effcode: effcode,
165
+ mainDataset: mainDataSetKey
165
166
  },
166
167
  post: backData
167
168
  }, {
package/lib/utils/form.js CHANGED
@@ -38,7 +38,7 @@ function getFormItem() {
38
38
  props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
39
39
  var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
40
40
  if (!property) return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
41
- if (property === 'sint') props.opt_decimal = 0;
41
+ if (property === 'sint' || property === 'number') props.opt_decimal = 0;
42
42
  var _translator = (0, _form.translator)(props),
43
43
  name = _translator.name,
44
44
  translateProps = (0, _objectWithoutProperties2.default)(_translator, _excluded2);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@luck-design-biz/luckda",
3
- "version": "0.0.13-1",
3
+ "version": "0.0.13-2",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",