@luck-design-biz/luckda 0.0.12-8-test → 0.0.13-1
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/components/LdAutoForm/index.js +6 -7
- package/es/components/LdGridForm/index.js +18 -12
- package/es/helper/action.js +0 -1
- package/es/utils/form.js +4 -5
- package/es/utils/grid.js +6 -0
- package/lib/components/LdAutoForm/index.js +5 -6
- package/lib/components/LdGridForm/index.js +17 -11
- package/lib/helper/action.js +0 -1
- package/lib/utils/form.js +4 -5
- package/lib/utils/grid.js +6 -0
- package/package.json +1 -1
|
@@ -3,8 +3,7 @@ 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
5
|
var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "formRef", "formMode", "formData"];
|
|
6
|
-
import React, {
|
|
7
|
-
import { useCreation, useMemoizedFn } from 'ahooks';
|
|
6
|
+
import React, { createRef, useContext } from 'react';
|
|
8
7
|
import { transform } from 'lodash';
|
|
9
8
|
import { AutoForm } from '@luck-design-biz/base/FormList';
|
|
10
9
|
import ldBuilder from '../../helper/ldBuilder';
|
|
@@ -47,9 +46,9 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
|
|
|
47
46
|
props = _objectWithoutProperties(_ref, _excluded);
|
|
48
47
|
var _ref2 = useContext(LuckDaContext) || {},
|
|
49
48
|
setFieldProps = _ref2.setFieldProps;
|
|
50
|
-
var defaultValues =
|
|
49
|
+
var defaultValues = /*#__PURE__*/createRef();
|
|
51
50
|
var isMain = ldId === mainFormLdId;
|
|
52
|
-
var basicItems =
|
|
51
|
+
var basicItems = function () {
|
|
53
52
|
var _defaultValues = {};
|
|
54
53
|
var _nodes = transform(columns, function (result, col) {
|
|
55
54
|
if (col.isShowInForm) {
|
|
@@ -78,13 +77,13 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
|
|
|
78
77
|
}, i.props);
|
|
79
78
|
})));
|
|
80
79
|
return _nodes;
|
|
81
|
-
}
|
|
80
|
+
}();
|
|
82
81
|
var formConfig = {
|
|
83
82
|
formId: ldId,
|
|
84
83
|
isMain: isMain,
|
|
85
84
|
defaultDataSource: _objectSpread(_objectSpread({}, formItemDataFormat(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current))
|
|
86
85
|
};
|
|
87
|
-
var onOperate =
|
|
86
|
+
var onOperate = function onOperate() {
|
|
88
87
|
var _onOperate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
89
88
|
var behaviorKey = arguments.length > 1 ? arguments[1] : undefined;
|
|
90
89
|
return _objectSpread(_objectSpread({
|
|
@@ -113,7 +112,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
|
|
|
113
112
|
return _defineProperty({}, dataSetKey, _submitData);
|
|
114
113
|
}
|
|
115
114
|
});
|
|
116
|
-
}
|
|
115
|
+
};
|
|
117
116
|
return /*#__PURE__*/React.createElement(AutoForm, _extends({}, props, {
|
|
118
117
|
onQuery: _objectSpread(_objectSpread({
|
|
119
118
|
api: behaviorCall,
|
|
@@ -2,9 +2,8 @@ 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", "columnsRewrite", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className"];
|
|
6
|
-
import React, {
|
|
7
|
-
import { useCreation, useMemoizedFn } from 'ahooks';
|
|
5
|
+
var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "columnsRewrite", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode"];
|
|
6
|
+
import React, { createRef, useContext } from 'react';
|
|
8
7
|
import { transform } from 'lodash';
|
|
9
8
|
import classNames from 'classnames';
|
|
10
9
|
import ldBuilder from '../../helper/ldBuilder';
|
|
@@ -50,10 +49,12 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
|
|
|
50
49
|
_ref$ticketData = _ref.ticketData,
|
|
51
50
|
ticketData = _ref$ticketData === void 0 ? {} : _ref$ticketData,
|
|
52
51
|
className = _ref.className,
|
|
52
|
+
formRef = _ref.formRef,
|
|
53
|
+
formMode = _ref.formMode,
|
|
53
54
|
props = _objectWithoutProperties(_ref, _excluded);
|
|
54
55
|
var _ref2 = useContext(LuckDaContext) || {},
|
|
55
56
|
setFieldProps = _ref2.setFieldProps;
|
|
56
|
-
var defaultValues =
|
|
57
|
+
var defaultValues = /*#__PURE__*/createRef();
|
|
57
58
|
var isMain = ldId === mainFormLdId;
|
|
58
59
|
var gridColumns = columns.map(function (col) {
|
|
59
60
|
if ((col.comName || defaultComName[col.property]) === 'radio') return _objectSpread(_objectSpread({}, col), {}, {
|
|
@@ -61,11 +62,11 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
|
|
|
61
62
|
});
|
|
62
63
|
return col;
|
|
63
64
|
});
|
|
64
|
-
var _columns =
|
|
65
|
+
var _columns = function () {
|
|
65
66
|
var _defaultValues = {};
|
|
66
67
|
var _nodes = transform(gridColumns, function (result, col) {
|
|
67
68
|
if (col.isShowInForm) {
|
|
68
|
-
var _objectSpread2;
|
|
69
|
+
var _objectSpread2, _customColumn;
|
|
69
70
|
var customColumn = columnsRewrite.find(function (column) {
|
|
70
71
|
return column.field === col.field;
|
|
71
72
|
}) || {};
|
|
@@ -74,7 +75,13 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
|
|
|
74
75
|
mode: 'grid'
|
|
75
76
|
});
|
|
76
77
|
_defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, col.field, col['optDefaultValue']), _defineProperty(_objectSpread2, "".concat(col.field, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
|
|
77
|
-
result.push(getFormColumn(type, col, customColumn)
|
|
78
|
+
result.push(getFormColumn(type, col, _objectSpread(_objectSpread({}, customColumn), {}, {
|
|
79
|
+
formItemRewrite: _objectSpread(_objectSpread({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
|
|
80
|
+
moduleCode: moduleCode,
|
|
81
|
+
formRef: formRef,
|
|
82
|
+
formMode: formMode
|
|
83
|
+
})
|
|
84
|
+
})));
|
|
78
85
|
}
|
|
79
86
|
}, []);
|
|
80
87
|
defaultValues.current = _defaultValues;
|
|
@@ -88,16 +95,15 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
|
|
|
88
95
|
});
|
|
89
96
|
})));
|
|
90
97
|
return _nodes;
|
|
91
|
-
}
|
|
98
|
+
}();
|
|
92
99
|
var defaultDataSource = _objectSpread(_objectSpread({}, formItemDataFormat(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current));
|
|
93
100
|
var formConfig = {
|
|
94
101
|
formId: ldId,
|
|
95
102
|
columns: _columns,
|
|
96
103
|
isMain: isMain,
|
|
97
|
-
defaultDataSource: defaultDataSource
|
|
98
|
-
newItemDefaultValue: defaultDataSource
|
|
104
|
+
defaultDataSource: defaultDataSource
|
|
99
105
|
};
|
|
100
|
-
var onOperate =
|
|
106
|
+
var onOperate = function onOperate() {
|
|
101
107
|
var _onOperate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
102
108
|
var behaviorKey = arguments.length > 1 ? arguments[1] : undefined;
|
|
103
109
|
return _objectSpread(_objectSpread({
|
|
@@ -122,7 +128,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
|
|
|
122
128
|
return _defineProperty({}, dataSetKey, _defineProperty({}, "".concat(behaviorKey, "List"), _submitData));
|
|
123
129
|
}
|
|
124
130
|
});
|
|
125
|
-
}
|
|
131
|
+
};
|
|
126
132
|
return /*#__PURE__*/React.createElement(GridForm, _extends({
|
|
127
133
|
noAddon: true,
|
|
128
134
|
operates: defaultOpe,
|
package/es/helper/action.js
CHANGED
package/es/utils/form.js
CHANGED
|
@@ -65,7 +65,6 @@ export var formItemDataFormat = function formItemDataFormat() {
|
|
|
65
65
|
var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
66
66
|
var omitValues = {};
|
|
67
67
|
var data = transform(propsList, function (result, n) {
|
|
68
|
-
var _values$name, _values$name2;
|
|
69
68
|
var _ref2 = n || {},
|
|
70
69
|
comName = _ref2.comName,
|
|
71
70
|
property = _ref2.property,
|
|
@@ -103,7 +102,7 @@ export var formItemDataFormat = function formItemDataFormat() {
|
|
|
103
102
|
result[name] = values[name];
|
|
104
103
|
break;
|
|
105
104
|
case 'upload':
|
|
106
|
-
result[name] =
|
|
105
|
+
result[name] = values[name];
|
|
107
106
|
break;
|
|
108
107
|
default:
|
|
109
108
|
if (!isNil(values["".concat(name, "_virtual")] || values[name])) result[name] = values["".concat(name, "_virtual")] || values[name];
|
|
@@ -125,7 +124,7 @@ export var dataFormat = function dataFormat() {
|
|
|
125
124
|
// 姚小川说:冗余字段后端处理,不需要前端传给后端
|
|
126
125
|
var values = clone(_values);
|
|
127
126
|
var data = transform(propsList, function (result, n) {
|
|
128
|
-
var _values$
|
|
127
|
+
var _values$name, _values$name2;
|
|
129
128
|
var _ref3 = n || {},
|
|
130
129
|
comName = _ref3.comName,
|
|
131
130
|
property = _ref3.property,
|
|
@@ -151,7 +150,7 @@ export var dataFormat = function dataFormat() {
|
|
|
151
150
|
case 'group':
|
|
152
151
|
if (isArray(values[name])) result[name] = values[name].map(function (v) {
|
|
153
152
|
return v.value || v.key;
|
|
154
|
-
}).join(',');else result[name] = !isNil((_values$
|
|
153
|
+
}).join(',');else result[name] = !isNil((_values$name = values[name]) === null || _values$name === void 0 ? void 0 : _values$name.value) ? values[name].value : ((_values$name2 = values[name]) === null || _values$name2 === void 0 ? void 0 : _values$name2.key) || null;
|
|
155
154
|
break;
|
|
156
155
|
case 'switch':
|
|
157
156
|
result[name] = values[name] ? 1 : 0;
|
|
@@ -163,7 +162,7 @@ export var dataFormat = function dataFormat() {
|
|
|
163
162
|
result[name] = values[name] ? moment(values[name]).format('YYYY') : null;
|
|
164
163
|
break;
|
|
165
164
|
case 'upload':
|
|
166
|
-
result[name] = values[name] && values[name][0] ?
|
|
165
|
+
result[name] = values[name] && values[name][0] ? values[name][0].name : null;
|
|
167
166
|
break;
|
|
168
167
|
default:
|
|
169
168
|
result[name] = values[name];
|
package/es/utils/grid.js
CHANGED
|
@@ -69,6 +69,12 @@ export function getColumnRender(name, type) {
|
|
|
69
69
|
}).join('/') : undefined;
|
|
70
70
|
};
|
|
71
71
|
break;
|
|
72
|
+
case 'upload':
|
|
73
|
+
render = function render(text, record) {
|
|
74
|
+
var _text$;
|
|
75
|
+
return text && ((_text$ = text[0]) === null || _text$ === void 0 ? void 0 : _text$.name) || text;
|
|
76
|
+
};
|
|
77
|
+
break;
|
|
72
78
|
default:
|
|
73
79
|
}
|
|
74
80
|
return render;
|
|
@@ -11,7 +11,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
|
|
|
11
11
|
var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
|
12
12
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
|
13
13
|
var _react = _interopRequireWildcard(require("react"));
|
|
14
|
-
var _ahooks = require("ahooks");
|
|
15
14
|
var _lodash = require("lodash");
|
|
16
15
|
var _FormList = require("@luck-design-biz/base/FormList");
|
|
17
16
|
var _ldBuilder = _interopRequireDefault(require("../../helper/ldBuilder"));
|
|
@@ -55,9 +54,9 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
|
|
|
55
54
|
props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
|
|
56
55
|
var _ref2 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
|
|
57
56
|
setFieldProps = _ref2.setFieldProps;
|
|
58
|
-
var defaultValues = (0, _react.
|
|
57
|
+
var defaultValues = /*#__PURE__*/(0, _react.createRef)();
|
|
59
58
|
var isMain = ldId === mainFormLdId;
|
|
60
|
-
var basicItems =
|
|
59
|
+
var basicItems = function () {
|
|
61
60
|
var _defaultValues = {};
|
|
62
61
|
var _nodes = (0, _lodash.transform)(columns, function (result, col) {
|
|
63
62
|
if (col.isShowInForm) {
|
|
@@ -86,13 +85,13 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
|
|
|
86
85
|
}, i.props);
|
|
87
86
|
})));
|
|
88
87
|
return _nodes;
|
|
89
|
-
}
|
|
88
|
+
}();
|
|
90
89
|
var formConfig = {
|
|
91
90
|
formId: ldId,
|
|
92
91
|
isMain: isMain,
|
|
93
92
|
defaultDataSource: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, (0, _utils.formItemDataFormat)(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current))
|
|
94
93
|
};
|
|
95
|
-
var onOperate =
|
|
94
|
+
var onOperate = function onOperate() {
|
|
96
95
|
var _onOperate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
97
96
|
var behaviorKey = arguments.length > 1 ? arguments[1] : undefined;
|
|
98
97
|
return (0, _objectSpread3.default)((0, _objectSpread3.default)({
|
|
@@ -121,7 +120,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
|
|
|
121
120
|
return (0, _defineProperty2.default)({}, dataSetKey, _submitData);
|
|
122
121
|
}
|
|
123
122
|
});
|
|
124
|
-
}
|
|
123
|
+
};
|
|
125
124
|
return /*#__PURE__*/_react.default.createElement(_FormList.AutoForm, (0, _extends2.default)({}, props, {
|
|
126
125
|
onQuery: (0, _objectSpread3.default)((0, _objectSpread3.default)({
|
|
127
126
|
api: _utils.behaviorCall,
|
|
@@ -11,7 +11,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
|
|
|
11
11
|
var _objectSpread5 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
|
12
12
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
|
13
13
|
var _react = _interopRequireWildcard(require("react"));
|
|
14
|
-
var _ahooks = require("ahooks");
|
|
15
14
|
var _lodash = require("lodash");
|
|
16
15
|
var _classnames = _interopRequireDefault(require("classnames"));
|
|
17
16
|
var _ldBuilder = _interopRequireDefault(require("../../helper/ldBuilder"));
|
|
@@ -20,7 +19,7 @@ var _utils = require("../../utils");
|
|
|
20
19
|
var _form = require("../../helper/form");
|
|
21
20
|
var _Builder = require("../Builder");
|
|
22
21
|
var _index = _interopRequireDefault(require("./index.less"));
|
|
23
|
-
var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "columnsRewrite", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className"];
|
|
22
|
+
var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "columnsRewrite", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode"];
|
|
24
23
|
var defaultOpe = ['read', 'add', 'update', 'delete'];
|
|
25
24
|
var buildLdGridForm = function buildLdGridForm(_ref) {
|
|
26
25
|
var _ref$columns = _ref.columns,
|
|
@@ -58,10 +57,12 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
|
|
|
58
57
|
_ref$ticketData = _ref.ticketData,
|
|
59
58
|
ticketData = _ref$ticketData === void 0 ? {} : _ref$ticketData,
|
|
60
59
|
className = _ref.className,
|
|
60
|
+
formRef = _ref.formRef,
|
|
61
|
+
formMode = _ref.formMode,
|
|
61
62
|
props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
|
|
62
63
|
var _ref2 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
|
|
63
64
|
setFieldProps = _ref2.setFieldProps;
|
|
64
|
-
var defaultValues = (0, _react.
|
|
65
|
+
var defaultValues = /*#__PURE__*/(0, _react.createRef)();
|
|
65
66
|
var isMain = ldId === mainFormLdId;
|
|
66
67
|
var gridColumns = columns.map(function (col) {
|
|
67
68
|
if ((col.comName || _form.defaultComName[col.property]) === 'radio') return (0, _objectSpread5.default)((0, _objectSpread5.default)({}, col), {}, {
|
|
@@ -69,11 +70,11 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
|
|
|
69
70
|
});
|
|
70
71
|
return col;
|
|
71
72
|
});
|
|
72
|
-
var _columns =
|
|
73
|
+
var _columns = function () {
|
|
73
74
|
var _defaultValues = {};
|
|
74
75
|
var _nodes = (0, _lodash.transform)(gridColumns, function (result, col) {
|
|
75
76
|
if (col.isShowInForm) {
|
|
76
|
-
var _objectSpread2;
|
|
77
|
+
var _objectSpread2, _customColumn;
|
|
77
78
|
var customColumn = columnsRewrite.find(function (column) {
|
|
78
79
|
return column.field === col.field;
|
|
79
80
|
}) || {};
|
|
@@ -82,7 +83,13 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
|
|
|
82
83
|
mode: 'grid'
|
|
83
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));
|
|
85
|
-
result.push((0, _utils.getFormColumn)(type, col, customColumn)
|
|
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), {}, {
|
|
88
|
+
moduleCode: moduleCode,
|
|
89
|
+
formRef: formRef,
|
|
90
|
+
formMode: formMode
|
|
91
|
+
})
|
|
92
|
+
})));
|
|
86
93
|
}
|
|
87
94
|
}, []);
|
|
88
95
|
defaultValues.current = _defaultValues;
|
|
@@ -96,16 +103,15 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
|
|
|
96
103
|
});
|
|
97
104
|
})));
|
|
98
105
|
return _nodes;
|
|
99
|
-
}
|
|
106
|
+
}();
|
|
100
107
|
var defaultDataSource = (0, _objectSpread5.default)((0, _objectSpread5.default)({}, (0, _utils.formItemDataFormat)(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current));
|
|
101
108
|
var formConfig = {
|
|
102
109
|
formId: ldId,
|
|
103
110
|
columns: _columns,
|
|
104
111
|
isMain: isMain,
|
|
105
|
-
defaultDataSource: defaultDataSource
|
|
106
|
-
newItemDefaultValue: defaultDataSource
|
|
112
|
+
defaultDataSource: defaultDataSource
|
|
107
113
|
};
|
|
108
|
-
var onOperate =
|
|
114
|
+
var onOperate = function onOperate() {
|
|
109
115
|
var _onOperate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
110
116
|
var behaviorKey = arguments.length > 1 ? arguments[1] : undefined;
|
|
111
117
|
return (0, _objectSpread5.default)((0, _objectSpread5.default)({
|
|
@@ -130,7 +136,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
|
|
|
130
136
|
return (0, _defineProperty2.default)({}, dataSetKey, (0, _defineProperty2.default)({}, "".concat(behaviorKey, "List"), _submitData));
|
|
131
137
|
}
|
|
132
138
|
});
|
|
133
|
-
}
|
|
139
|
+
};
|
|
134
140
|
return /*#__PURE__*/_react.default.createElement(_FormList.GridForm, (0, _extends2.default)({
|
|
135
141
|
noAddon: true,
|
|
136
142
|
operates: defaultOpe,
|
package/lib/helper/action.js
CHANGED
package/lib/utils/form.js
CHANGED
|
@@ -73,7 +73,6 @@ var formItemDataFormat = function formItemDataFormat() {
|
|
|
73
73
|
var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
74
74
|
var omitValues = {};
|
|
75
75
|
var data = (0, _lodash.transform)(propsList, function (result, n) {
|
|
76
|
-
var _values$name, _values$name2;
|
|
77
76
|
var _ref2 = n || {},
|
|
78
77
|
comName = _ref2.comName,
|
|
79
78
|
property = _ref2.property,
|
|
@@ -111,7 +110,7 @@ var formItemDataFormat = function formItemDataFormat() {
|
|
|
111
110
|
result[name] = values[name];
|
|
112
111
|
break;
|
|
113
112
|
case 'upload':
|
|
114
|
-
result[name] =
|
|
113
|
+
result[name] = values[name];
|
|
115
114
|
break;
|
|
116
115
|
default:
|
|
117
116
|
if (!(0, _lodash.isNil)(values["".concat(name, "_virtual")] || values[name])) result[name] = values["".concat(name, "_virtual")] || values[name];
|
|
@@ -134,7 +133,7 @@ var dataFormat = function dataFormat() {
|
|
|
134
133
|
// 姚小川说:冗余字段后端处理,不需要前端传给后端
|
|
135
134
|
var values = (0, _lodash.clone)(_values);
|
|
136
135
|
var data = (0, _lodash.transform)(propsList, function (result, n) {
|
|
137
|
-
var _values$
|
|
136
|
+
var _values$name, _values$name2;
|
|
138
137
|
var _ref3 = n || {},
|
|
139
138
|
comName = _ref3.comName,
|
|
140
139
|
property = _ref3.property,
|
|
@@ -160,7 +159,7 @@ var dataFormat = function dataFormat() {
|
|
|
160
159
|
case 'group':
|
|
161
160
|
if ((0, _lodash.isArray)(values[name])) result[name] = values[name].map(function (v) {
|
|
162
161
|
return v.value || v.key;
|
|
163
|
-
}).join(',');else result[name] = !(0, _lodash.isNil)((_values$
|
|
162
|
+
}).join(',');else result[name] = !(0, _lodash.isNil)((_values$name = values[name]) === null || _values$name === void 0 ? void 0 : _values$name.value) ? values[name].value : ((_values$name2 = values[name]) === null || _values$name2 === void 0 ? void 0 : _values$name2.key) || null;
|
|
164
163
|
break;
|
|
165
164
|
case 'switch':
|
|
166
165
|
result[name] = values[name] ? 1 : 0;
|
|
@@ -172,7 +171,7 @@ var dataFormat = function dataFormat() {
|
|
|
172
171
|
result[name] = values[name] ? (0, _moment.default)(values[name]).format('YYYY') : null;
|
|
173
172
|
break;
|
|
174
173
|
case 'upload':
|
|
175
|
-
result[name] = values[name] && values[name][0] ?
|
|
174
|
+
result[name] = values[name] && values[name][0] ? values[name][0].name : null;
|
|
176
175
|
break;
|
|
177
176
|
default:
|
|
178
177
|
result[name] = values[name];
|
package/lib/utils/grid.js
CHANGED
|
@@ -76,6 +76,12 @@ function getColumnRender(name, type) {
|
|
|
76
76
|
}).join('/') : undefined;
|
|
77
77
|
};
|
|
78
78
|
break;
|
|
79
|
+
case 'upload':
|
|
80
|
+
render = function render(text, record) {
|
|
81
|
+
var _text$;
|
|
82
|
+
return text && ((_text$ = text[0]) === null || _text$ === void 0 ? void 0 : _text$.name) || text;
|
|
83
|
+
};
|
|
84
|
+
break;
|
|
79
85
|
default:
|
|
80
86
|
}
|
|
81
87
|
return render;
|