@luck-design-biz/luckda 0.0.17 → 0.0.18
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 +2 -6
- package/es/components/LdFormList/index.js +13 -11
- package/es/components/LdGrid/index.js +3 -2
- package/es/components/LdTree/index.js +1 -1
- package/es/utils/grid.js +63 -2
- package/lib/components/LdAutoForm/index.js +2 -6
- package/lib/components/LdFormList/index.js +13 -11
- package/lib/components/LdGrid/index.js +3 -2
- package/lib/components/LdTree/index.js +1 -1
- package/lib/utils/grid.js +62 -0
- package/package.json +1 -1
|
@@ -113,13 +113,9 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
|
|
|
113
113
|
onQuery: _objectSpread(_objectSpread({
|
|
114
114
|
api: behaviorCall,
|
|
115
115
|
get: function get(formData) {
|
|
116
|
+
var _params2;
|
|
116
117
|
var _relationKey = isMain ? window.appConfig.constraintKeys.PRIMARY : relationKey;
|
|
117
|
-
var _params = {
|
|
118
|
-
indocno: formData[mainFormLdId] && formData[mainFormLdId][_relationKey] || ticketData[_relationKey],
|
|
119
|
-
moduleCode: moduleCode,
|
|
120
|
-
datasetCode: dataSetKey,
|
|
121
|
-
behaviorKey: 'readForm'
|
|
122
|
-
};
|
|
118
|
+
var _params = (_params2 = {}, _defineProperty(_params2, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][_relationKey] || ticketData[_relationKey]), _defineProperty(_params2, "moduleCode", moduleCode), _defineProperty(_params2, "datasetCode", dataSetKey), _defineProperty(_params2, "behaviorKey", isMain ? 'readForm' : 'readUniqueForm'), _params2);
|
|
123
119
|
if (!isMain) _params.relationDs = mainDataSetKey;
|
|
124
120
|
return _params;
|
|
125
121
|
}
|
|
@@ -118,34 +118,35 @@ var LdFormList = function LdFormList(_ref) {
|
|
|
118
118
|
}, bpmButtonProps)));
|
|
119
119
|
};
|
|
120
120
|
useAsyncEffect( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
121
|
-
var _props$ticketData, _params, response, _yield$readBehaviorCa, code, data, _props$ticketData2, _props$ticketData3, bpmInfoObj, tempObj;
|
|
121
|
+
var _props$ticketData, PRIMARY, _params, response, _yield$readBehaviorCa, code, data, _props$ticketData2, _props$ticketData3, bpmInfoObj, tempObj;
|
|
122
122
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
123
123
|
while (1) switch (_context.prev = _context.next) {
|
|
124
124
|
case 0:
|
|
125
125
|
if (!(formMode !== 'add')) {
|
|
126
|
-
_context.next =
|
|
126
|
+
_context.next = 13;
|
|
127
127
|
break;
|
|
128
128
|
}
|
|
129
|
+
PRIMARY = window.appConfig.constraintKeys.PRIMARY;
|
|
129
130
|
_params = {
|
|
130
|
-
indocno: (_props$ticketData = props.ticketData) === null || _props$ticketData === void 0 ? void 0 : _props$ticketData
|
|
131
|
+
indocno: (_props$ticketData = props.ticketData) === null || _props$ticketData === void 0 ? void 0 : _props$ticketData[PRIMARY],
|
|
131
132
|
moduleCode: rest.moduleCode,
|
|
132
133
|
datasetCode: mainDataSetKey,
|
|
133
134
|
mainDataSetKey: mainDataSetKey,
|
|
134
135
|
behaviorKey: 'readBpmDeploy'
|
|
135
136
|
}; // 请求是否有工作流服务
|
|
136
|
-
_context.next =
|
|
137
|
+
_context.next = 5;
|
|
137
138
|
return readBehaviorCall(_params);
|
|
138
|
-
case
|
|
139
|
+
case 5:
|
|
139
140
|
response = _context.sent;
|
|
140
141
|
if (!(response.code === 1 && response.data)) {
|
|
141
|
-
_context.next =
|
|
142
|
+
_context.next = 13;
|
|
142
143
|
break;
|
|
143
144
|
}
|
|
144
|
-
_context.next =
|
|
145
|
+
_context.next = 9;
|
|
145
146
|
return readBehaviorCall(_objectSpread(_objectSpread({}, _params), {}, {
|
|
146
147
|
behaviorKey: 'readBpm'
|
|
147
148
|
}));
|
|
148
|
-
case
|
|
149
|
+
case 9:
|
|
149
150
|
_yield$readBehaviorCa = _context.sent;
|
|
150
151
|
code = _yield$readBehaviorCa.code;
|
|
151
152
|
data = _yield$readBehaviorCa.data;
|
|
@@ -155,15 +156,15 @@ var LdFormList = function LdFormList(_ref) {
|
|
|
155
156
|
bizKey: bpmInfoObj.bizKey,
|
|
156
157
|
sname: bpmInfoObj.name,
|
|
157
158
|
modelKey: bpmInfoObj.bpmKey,
|
|
158
|
-
idocid: (_props$ticketData2 = props.ticketData) === null || _props$ticketData2 === void 0 ? void 0 : _props$ticketData2
|
|
159
|
+
idocid: (_props$ticketData2 = props.ticketData) === null || _props$ticketData2 === void 0 ? void 0 : _props$ticketData2[PRIMARY],
|
|
159
160
|
moduleCode: rest.moduleCode,
|
|
160
161
|
datasetCode: mainDataSetKey,
|
|
161
|
-
indocno: (_props$ticketData3 = props.ticketData) === null || _props$ticketData3 === void 0 ? void 0 : _props$ticketData3
|
|
162
|
+
indocno: (_props$ticketData3 = props.ticketData) === null || _props$ticketData3 === void 0 ? void 0 : _props$ticketData3[PRIMARY]
|
|
162
163
|
});
|
|
163
164
|
setBizData(tempObj);
|
|
164
165
|
setIsCustomRenderAffixRight(true);
|
|
165
166
|
}
|
|
166
|
-
case
|
|
167
|
+
case 13:
|
|
167
168
|
case "end":
|
|
168
169
|
return _context.stop();
|
|
169
170
|
}
|
|
@@ -194,6 +195,7 @@ var LdFormList = function LdFormList(_ref) {
|
|
|
194
195
|
afterSubmit(success, mainKey, res);
|
|
195
196
|
} else {
|
|
196
197
|
var _formListRef$current;
|
|
198
|
+
formListRef.current.setFormMode('info');
|
|
197
199
|
props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
|
|
198
200
|
var mainFormData = res.detail[res.list[0]];
|
|
199
201
|
formListRef.current.onQuery(null, _defineProperty({}, mainFormLdId, mainFormData), function () {
|
|
@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
|
|
|
2
2
|
import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
|
|
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", "afterInit", "namespace", "wrapperRef", "list", "detail", "params", "filters", "loading", "unclosableSet", "onQuery", "doQuery", "pageno", "pagesize", "totalCount", "columnsRewrite", "columnsReset", "batchOperations", "formatDataSource", "resultSet", "actionsColumn", "readFilter", "isFlow", "isTreeGrid"],
|
|
5
|
+
var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "namespace", "wrapperRef", "list", "detail", "params", "filters", "loading", "unclosableSet", "onQuery", "doQuery", "pageno", "pagesize", "totalCount", "columnsRewrite", "columnsReset", "batchOperations", "formatDataSource", "resultSet", "actionsColumn", "readFilter", "isFlow", "isTreeGrid", "writable"],
|
|
6
6
|
_excluded2 = ["ldId", "moduleCode", "suppressInit", "overModel", "afterQuery", "isTreeGrid"];
|
|
7
7
|
import React, { forwardRef, useImperativeHandle, useRef, useEffect } from 'react';
|
|
8
8
|
import { getDvaApp } from 'umi';
|
|
@@ -42,6 +42,7 @@ var LdGrid = function LdGrid(_ref) {
|
|
|
42
42
|
readFilter = _ref.readFilter,
|
|
43
43
|
isFlow = _ref.isFlow,
|
|
44
44
|
isTreeGrid = _ref.isTreeGrid,
|
|
45
|
+
writable = _ref.writable,
|
|
45
46
|
props = _objectWithoutProperties(_ref, _excluded);
|
|
46
47
|
var gridRef = useRef(null);
|
|
47
48
|
var treeConfig = useCreation(function () {
|
|
@@ -99,7 +100,7 @@ var LdGrid = function LdGrid(_ref) {
|
|
|
99
100
|
result.push(customColumns[field]);
|
|
100
101
|
} else if (defaultColumns[field].isShowInGrid)
|
|
101
102
|
// 数据集中存在的字段和自定义结合展示
|
|
102
|
-
result.push(getGridColumn(defaultColumns[field], customColumns[field] || {}, isTreeGrid));
|
|
103
|
+
result.push(getGridColumn(defaultColumns[field], customColumns[field] || {}, isTreeGrid, writable));
|
|
103
104
|
}, []);
|
|
104
105
|
}, [columns, columnsRewrite, columnsReset]);
|
|
105
106
|
var _actionsColumn = useCreation(function () {
|
|
@@ -90,7 +90,7 @@ var LdTree = function LdTree(_ref) {
|
|
|
90
90
|
defaultExpandedKeys: defaultExpanded
|
|
91
91
|
});
|
|
92
92
|
}
|
|
93
|
-
var treeData = dataToTreeFormat ? dataToTreeFormat(data) : dataToTree(data, null,
|
|
93
|
+
var treeData = dataToTreeFormat ? dataToTreeFormat(data) : dataToTree(data, null, window.appConfig.constraintKeys.PRIMARY, window.appConfig.constraintKeys.PARENT);
|
|
94
94
|
setDataSource(treeData);
|
|
95
95
|
afterInit && afterInit(treeData);
|
|
96
96
|
}
|
package/es/utils/grid.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
1
2
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
2
3
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
|
3
4
|
var _excluded = ["comName", "property"],
|
|
@@ -5,13 +6,14 @@ var _excluded = ["comName", "property"],
|
|
|
5
6
|
_excluded3 = ["filter", "filterParams"];
|
|
6
7
|
import React from "react";
|
|
7
8
|
import { getDvaApp } from 'umi';
|
|
8
|
-
import { merge, isNil, isArray, includes } from 'lodash';
|
|
9
|
+
import { merge, isNil, isArray, includes, capitalize } from 'lodash';
|
|
9
10
|
import { Switch, Tag } from 'antd';
|
|
10
11
|
import moment from 'moment';
|
|
11
12
|
import UploadGridCell from '../upload/GridCell';
|
|
12
13
|
import { formatMessage } from '@luck-design-biz/base/utils';
|
|
13
14
|
import api from '@/services/ApiConfig';
|
|
14
|
-
import { defaultComName, translator, formatCustomProps } from '../helper/form';
|
|
15
|
+
import { defaultComName, translator, formatCustomProps, splitStrToObj } from '../helper/form';
|
|
16
|
+
import * as formItemUtils from '../helper/FromItems';
|
|
15
17
|
|
|
16
18
|
// const { dispatch } = getDvaApp()?._store;
|
|
17
19
|
|
|
@@ -98,6 +100,7 @@ export var getGridColumn = function getGridColumn() {
|
|
|
98
100
|
props = _objectWithoutProperties(_ref, _excluded);
|
|
99
101
|
var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
100
102
|
var isTreeGrid = arguments.length > 2 ? arguments[2] : undefined;
|
|
103
|
+
var writable = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
|
|
101
104
|
var _props$isVirtual = props.isVirtual,
|
|
102
105
|
isVirtual = _props$isVirtual === void 0 ? false : _props$isVirtual;
|
|
103
106
|
var _translator = translator(props),
|
|
@@ -219,5 +222,63 @@ export var getGridColumn = function getGridColumn() {
|
|
|
219
222
|
data.filter = 'text';
|
|
220
223
|
}
|
|
221
224
|
} else data.filter = false;
|
|
225
|
+
if (writable && props.isShowInForm && !props.isReadOnly) {
|
|
226
|
+
data.editable = props.isNotNull ? {
|
|
227
|
+
required: true
|
|
228
|
+
} : true;
|
|
229
|
+
if (_props.cellWriter) data.cellWriter = _props.cellWriter;else {
|
|
230
|
+
var formItemCom = capitalize(comName || defaultComName[property]) === 'Textarea' ? 'String' : capitalize(comName || defaultComName[property]);
|
|
231
|
+
var getFormItemUtils = formItemUtils["get".concat(formItemCom, "Item")];
|
|
232
|
+
var formItemProps = {};
|
|
233
|
+
switch (formItemCom) {
|
|
234
|
+
case 'date':
|
|
235
|
+
formItemProps = {
|
|
236
|
+
dataFormat: function dataFormat(value) {
|
|
237
|
+
var _ref2;
|
|
238
|
+
return _ref2 = {}, _defineProperty(_ref2, name, value ? moment(value).valueOf() : undefined), _defineProperty(_ref2, "".concat(name, "_virtual"), value ? moment(value).format('YYYY-MM-DD HH:mm:ss') : undefined), _ref2;
|
|
239
|
+
},
|
|
240
|
+
inputFormat: function inputFormat(value, record, params) {
|
|
241
|
+
return moment(record["".concat(name, "_virtual")], 'YYYY-MM-DD HH:mm:ss');
|
|
242
|
+
}
|
|
243
|
+
};
|
|
244
|
+
break;
|
|
245
|
+
case 'user':
|
|
246
|
+
case 'select':
|
|
247
|
+
case 'group':
|
|
248
|
+
if (translateProps.multiple) {
|
|
249
|
+
formItemProps = {
|
|
250
|
+
dataFormat: function dataFormat(value) {
|
|
251
|
+
var _ref3;
|
|
252
|
+
return _ref3 = {}, _defineProperty(_ref3, name, value.map(function (v) {
|
|
253
|
+
return v.value || v.key;
|
|
254
|
+
}).join(',')), _defineProperty(_ref3, "".concat(name, "_virtual"), value.map(function (v) {
|
|
255
|
+
return v.label;
|
|
256
|
+
}).join(',')), _ref3;
|
|
257
|
+
},
|
|
258
|
+
inputFormat: function inputFormat(value, record, params) {
|
|
259
|
+
return _defineProperty({}, name, splitStrToObj(value, record["".concat(name, "_virtual")]));
|
|
260
|
+
}
|
|
261
|
+
};
|
|
262
|
+
} else {
|
|
263
|
+
formItemProps = {
|
|
264
|
+
dataFormat: function dataFormat(value) {
|
|
265
|
+
var _ref5;
|
|
266
|
+
return _ref5 = {}, _defineProperty(_ref5, name, value ? value.value || value.key : undefined), _defineProperty(_ref5, "".concat(name, "_virtual"), value ? value.label : undefined), _ref5;
|
|
267
|
+
},
|
|
268
|
+
inputFormat: function inputFormat(value, record, params) {
|
|
269
|
+
return _defineProperty({}, name, !isNil(value) ? {
|
|
270
|
+
key: value,
|
|
271
|
+
value: value,
|
|
272
|
+
label: record["".concat(name, "_virtual")]
|
|
273
|
+
} : undefined);
|
|
274
|
+
}
|
|
275
|
+
};
|
|
276
|
+
}
|
|
277
|
+
break;
|
|
278
|
+
}
|
|
279
|
+
;
|
|
280
|
+
data.cellWriter = getFormItemUtils(_objectSpread(_objectSpread({}, _props), formItemProps));
|
|
281
|
+
}
|
|
282
|
+
}
|
|
222
283
|
return data;
|
|
223
284
|
};
|
|
@@ -121,13 +121,9 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
|
|
|
121
121
|
onQuery: (0, _objectSpread3.default)((0, _objectSpread3.default)({
|
|
122
122
|
api: _utils.behaviorCall,
|
|
123
123
|
get: function get(formData) {
|
|
124
|
+
var _params2;
|
|
124
125
|
var _relationKey = isMain ? window.appConfig.constraintKeys.PRIMARY : relationKey;
|
|
125
|
-
var _params = {
|
|
126
|
-
indocno: formData[mainFormLdId] && formData[mainFormLdId][_relationKey] || ticketData[_relationKey],
|
|
127
|
-
moduleCode: moduleCode,
|
|
128
|
-
datasetCode: dataSetKey,
|
|
129
|
-
behaviorKey: 'readForm'
|
|
130
|
-
};
|
|
126
|
+
var _params = (_params2 = {}, (0, _defineProperty2.default)(_params2, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][_relationKey] || ticketData[_relationKey]), (0, _defineProperty2.default)(_params2, "moduleCode", moduleCode), (0, _defineProperty2.default)(_params2, "datasetCode", dataSetKey), (0, _defineProperty2.default)(_params2, "behaviorKey", isMain ? 'readForm' : 'readUniqueForm'), _params2);
|
|
131
127
|
if (!isMain) _params.relationDs = mainDataSetKey;
|
|
132
128
|
return _params;
|
|
133
129
|
}
|
|
@@ -125,34 +125,35 @@ var LdFormList = function LdFormList(_ref) {
|
|
|
125
125
|
}, bpmButtonProps)));
|
|
126
126
|
};
|
|
127
127
|
(0, _ahooks.useAsyncEffect)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
|
|
128
|
-
var _props$ticketData, _params, response, _yield$readBehaviorCa, code, data, _props$ticketData2, _props$ticketData3, bpmInfoObj, tempObj;
|
|
128
|
+
var _props$ticketData, PRIMARY, _params, response, _yield$readBehaviorCa, code, data, _props$ticketData2, _props$ticketData3, bpmInfoObj, tempObj;
|
|
129
129
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
|
|
130
130
|
while (1) switch (_context.prev = _context.next) {
|
|
131
131
|
case 0:
|
|
132
132
|
if (!(formMode !== 'add')) {
|
|
133
|
-
_context.next =
|
|
133
|
+
_context.next = 13;
|
|
134
134
|
break;
|
|
135
135
|
}
|
|
136
|
+
PRIMARY = window.appConfig.constraintKeys.PRIMARY;
|
|
136
137
|
_params = {
|
|
137
|
-
indocno: (_props$ticketData = props.ticketData) === null || _props$ticketData === void 0 ? void 0 : _props$ticketData
|
|
138
|
+
indocno: (_props$ticketData = props.ticketData) === null || _props$ticketData === void 0 ? void 0 : _props$ticketData[PRIMARY],
|
|
138
139
|
moduleCode: rest.moduleCode,
|
|
139
140
|
datasetCode: mainDataSetKey,
|
|
140
141
|
mainDataSetKey: mainDataSetKey,
|
|
141
142
|
behaviorKey: 'readBpmDeploy'
|
|
142
143
|
}; // 请求是否有工作流服务
|
|
143
|
-
_context.next =
|
|
144
|
+
_context.next = 5;
|
|
144
145
|
return (0, _services.readBehaviorCall)(_params);
|
|
145
|
-
case
|
|
146
|
+
case 5:
|
|
146
147
|
response = _context.sent;
|
|
147
148
|
if (!(response.code === 1 && response.data)) {
|
|
148
|
-
_context.next =
|
|
149
|
+
_context.next = 13;
|
|
149
150
|
break;
|
|
150
151
|
}
|
|
151
|
-
_context.next =
|
|
152
|
+
_context.next = 9;
|
|
152
153
|
return (0, _services.readBehaviorCall)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _params), {}, {
|
|
153
154
|
behaviorKey: 'readBpm'
|
|
154
155
|
}));
|
|
155
|
-
case
|
|
156
|
+
case 9:
|
|
156
157
|
_yield$readBehaviorCa = _context.sent;
|
|
157
158
|
code = _yield$readBehaviorCa.code;
|
|
158
159
|
data = _yield$readBehaviorCa.data;
|
|
@@ -162,15 +163,15 @@ var LdFormList = function LdFormList(_ref) {
|
|
|
162
163
|
bizKey: bpmInfoObj.bizKey,
|
|
163
164
|
sname: bpmInfoObj.name,
|
|
164
165
|
modelKey: bpmInfoObj.bpmKey,
|
|
165
|
-
idocid: (_props$ticketData2 = props.ticketData) === null || _props$ticketData2 === void 0 ? void 0 : _props$ticketData2
|
|
166
|
+
idocid: (_props$ticketData2 = props.ticketData) === null || _props$ticketData2 === void 0 ? void 0 : _props$ticketData2[PRIMARY],
|
|
166
167
|
moduleCode: rest.moduleCode,
|
|
167
168
|
datasetCode: mainDataSetKey,
|
|
168
|
-
indocno: (_props$ticketData3 = props.ticketData) === null || _props$ticketData3 === void 0 ? void 0 : _props$ticketData3
|
|
169
|
+
indocno: (_props$ticketData3 = props.ticketData) === null || _props$ticketData3 === void 0 ? void 0 : _props$ticketData3[PRIMARY]
|
|
169
170
|
});
|
|
170
171
|
setBizData(tempObj);
|
|
171
172
|
setIsCustomRenderAffixRight(true);
|
|
172
173
|
}
|
|
173
|
-
case
|
|
174
|
+
case 13:
|
|
174
175
|
case "end":
|
|
175
176
|
return _context.stop();
|
|
176
177
|
}
|
|
@@ -201,6 +202,7 @@ var LdFormList = function LdFormList(_ref) {
|
|
|
201
202
|
afterSubmit(success, mainKey, res);
|
|
202
203
|
} else {
|
|
203
204
|
var _formListRef$current;
|
|
205
|
+
formListRef.current.setFormMode('info');
|
|
204
206
|
props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
|
|
205
207
|
var mainFormData = res.detail[res.list[0]];
|
|
206
208
|
formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, mainFormData), function () {
|
|
@@ -20,7 +20,7 @@ var _List = require("@luck-design-biz/base/List");
|
|
|
20
20
|
var _ldBuilder = _interopRequireDefault(require("../../helper/ldBuilder"));
|
|
21
21
|
var _utils = require("../../utils");
|
|
22
22
|
var _model = _interopRequireDefault(require("./model"));
|
|
23
|
-
var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "namespace", "wrapperRef", "list", "detail", "params", "filters", "loading", "unclosableSet", "onQuery", "doQuery", "pageno", "pagesize", "totalCount", "columnsRewrite", "columnsReset", "batchOperations", "formatDataSource", "resultSet", "actionsColumn", "readFilter", "isFlow", "isTreeGrid"],
|
|
23
|
+
var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "namespace", "wrapperRef", "list", "detail", "params", "filters", "loading", "unclosableSet", "onQuery", "doQuery", "pageno", "pagesize", "totalCount", "columnsRewrite", "columnsReset", "batchOperations", "formatDataSource", "resultSet", "actionsColumn", "readFilter", "isFlow", "isTreeGrid", "writable"],
|
|
24
24
|
_excluded2 = ["ldId", "moduleCode", "suppressInit", "overModel", "afterQuery", "isTreeGrid"];
|
|
25
25
|
var LdGrid = function LdGrid(_ref) {
|
|
26
26
|
var columns = _ref.columns,
|
|
@@ -50,6 +50,7 @@ var LdGrid = function LdGrid(_ref) {
|
|
|
50
50
|
readFilter = _ref.readFilter,
|
|
51
51
|
isFlow = _ref.isFlow,
|
|
52
52
|
isTreeGrid = _ref.isTreeGrid,
|
|
53
|
+
writable = _ref.writable,
|
|
53
54
|
props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
|
|
54
55
|
var gridRef = (0, _react.useRef)(null);
|
|
55
56
|
var treeConfig = (0, _ahooks.useCreation)(function () {
|
|
@@ -107,7 +108,7 @@ var LdGrid = function LdGrid(_ref) {
|
|
|
107
108
|
result.push(customColumns[field]);
|
|
108
109
|
} else if (defaultColumns[field].isShowInGrid)
|
|
109
110
|
// 数据集中存在的字段和自定义结合展示
|
|
110
|
-
result.push((0, _utils.getGridColumn)(defaultColumns[field], customColumns[field] || {}, isTreeGrid));
|
|
111
|
+
result.push((0, _utils.getGridColumn)(defaultColumns[field], customColumns[field] || {}, isTreeGrid, writable));
|
|
111
112
|
}, []);
|
|
112
113
|
}, [columns, columnsRewrite, columnsReset]);
|
|
113
114
|
var _actionsColumn = (0, _ahooks.useCreation)(function () {
|
|
@@ -98,7 +98,7 @@ var LdTree = function LdTree(_ref) {
|
|
|
98
98
|
defaultExpandedKeys: defaultExpanded
|
|
99
99
|
});
|
|
100
100
|
}
|
|
101
|
-
var treeData = dataToTreeFormat ? dataToTreeFormat(data) : (0, _utils.dataToTree)(data, null,
|
|
101
|
+
var treeData = dataToTreeFormat ? dataToTreeFormat(data) : (0, _utils.dataToTree)(data, null, window.appConfig.constraintKeys.PRIMARY, window.appConfig.constraintKeys.PARENT);
|
|
102
102
|
setDataSource(treeData);
|
|
103
103
|
afterInit && afterInit(treeData);
|
|
104
104
|
}
|
package/lib/utils/grid.js
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
|
4
|
+
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
|
|
4
5
|
Object.defineProperty(exports, "__esModule", {
|
|
5
6
|
value: true
|
|
6
7
|
});
|
|
7
8
|
exports.getColumnRender = getColumnRender;
|
|
8
9
|
exports.getGridColumn = void 0;
|
|
10
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
9
11
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
|
10
12
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
|
11
13
|
var _react = _interopRequireDefault(require("react"));
|
|
@@ -17,6 +19,7 @@ var _GridCell = _interopRequireDefault(require("../upload/GridCell"));
|
|
|
17
19
|
var _utils = require("@luck-design-biz/base/utils");
|
|
18
20
|
var _ApiConfig = _interopRequireDefault(require("@/services/ApiConfig"));
|
|
19
21
|
var _form = require("../helper/form");
|
|
22
|
+
var formItemUtils = _interopRequireWildcard(require("../helper/FromItems"));
|
|
20
23
|
var _excluded = ["comName", "property"],
|
|
21
24
|
_excluded2 = ["name"],
|
|
22
25
|
_excluded3 = ["filter", "filterParams"];
|
|
@@ -105,6 +108,7 @@ var getGridColumn = function getGridColumn() {
|
|
|
105
108
|
props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
|
|
106
109
|
var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
107
110
|
var isTreeGrid = arguments.length > 2 ? arguments[2] : undefined;
|
|
111
|
+
var writable = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
|
|
108
112
|
var _props$isVirtual = props.isVirtual,
|
|
109
113
|
isVirtual = _props$isVirtual === void 0 ? false : _props$isVirtual;
|
|
110
114
|
var _translator = (0, _form.translator)(props),
|
|
@@ -226,6 +230,64 @@ var getGridColumn = function getGridColumn() {
|
|
|
226
230
|
data.filter = 'text';
|
|
227
231
|
}
|
|
228
232
|
} else data.filter = false;
|
|
233
|
+
if (writable && props.isShowInForm && !props.isReadOnly) {
|
|
234
|
+
data.editable = props.isNotNull ? {
|
|
235
|
+
required: true
|
|
236
|
+
} : true;
|
|
237
|
+
if (_props.cellWriter) data.cellWriter = _props.cellWriter;else {
|
|
238
|
+
var formItemCom = (0, _lodash.capitalize)(comName || _form.defaultComName[property]) === 'Textarea' ? 'String' : (0, _lodash.capitalize)(comName || _form.defaultComName[property]);
|
|
239
|
+
var getFormItemUtils = formItemUtils["get".concat(formItemCom, "Item")];
|
|
240
|
+
var formItemProps = {};
|
|
241
|
+
switch (formItemCom) {
|
|
242
|
+
case 'date':
|
|
243
|
+
formItemProps = {
|
|
244
|
+
dataFormat: function dataFormat(value) {
|
|
245
|
+
var _ref2;
|
|
246
|
+
return _ref2 = {}, (0, _defineProperty2.default)(_ref2, name, value ? (0, _moment.default)(value).valueOf() : undefined), (0, _defineProperty2.default)(_ref2, "".concat(name, "_virtual"), value ? (0, _moment.default)(value).format('YYYY-MM-DD HH:mm:ss') : undefined), _ref2;
|
|
247
|
+
},
|
|
248
|
+
inputFormat: function inputFormat(value, record, params) {
|
|
249
|
+
return (0, _moment.default)(record["".concat(name, "_virtual")], 'YYYY-MM-DD HH:mm:ss');
|
|
250
|
+
}
|
|
251
|
+
};
|
|
252
|
+
break;
|
|
253
|
+
case 'user':
|
|
254
|
+
case 'select':
|
|
255
|
+
case 'group':
|
|
256
|
+
if (translateProps.multiple) {
|
|
257
|
+
formItemProps = {
|
|
258
|
+
dataFormat: function dataFormat(value) {
|
|
259
|
+
var _ref3;
|
|
260
|
+
return _ref3 = {}, (0, _defineProperty2.default)(_ref3, name, value.map(function (v) {
|
|
261
|
+
return v.value || v.key;
|
|
262
|
+
}).join(',')), (0, _defineProperty2.default)(_ref3, "".concat(name, "_virtual"), value.map(function (v) {
|
|
263
|
+
return v.label;
|
|
264
|
+
}).join(',')), _ref3;
|
|
265
|
+
},
|
|
266
|
+
inputFormat: function inputFormat(value, record, params) {
|
|
267
|
+
return (0, _defineProperty2.default)({}, name, (0, _form.splitStrToObj)(value, record["".concat(name, "_virtual")]));
|
|
268
|
+
}
|
|
269
|
+
};
|
|
270
|
+
} else {
|
|
271
|
+
formItemProps = {
|
|
272
|
+
dataFormat: function dataFormat(value) {
|
|
273
|
+
var _ref5;
|
|
274
|
+
return _ref5 = {}, (0, _defineProperty2.default)(_ref5, name, value ? value.value || value.key : undefined), (0, _defineProperty2.default)(_ref5, "".concat(name, "_virtual"), value ? value.label : undefined), _ref5;
|
|
275
|
+
},
|
|
276
|
+
inputFormat: function inputFormat(value, record, params) {
|
|
277
|
+
return (0, _defineProperty2.default)({}, name, !(0, _lodash.isNil)(value) ? {
|
|
278
|
+
key: value,
|
|
279
|
+
value: value,
|
|
280
|
+
label: record["".concat(name, "_virtual")]
|
|
281
|
+
} : undefined);
|
|
282
|
+
}
|
|
283
|
+
};
|
|
284
|
+
}
|
|
285
|
+
break;
|
|
286
|
+
}
|
|
287
|
+
;
|
|
288
|
+
data.cellWriter = getFormItemUtils((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), formItemProps));
|
|
289
|
+
}
|
|
290
|
+
}
|
|
229
291
|
return data;
|
|
230
292
|
};
|
|
231
293
|
exports.getGridColumn = getGridColumn;
|