@luck-design-biz/luckda 0.0.14-1 → 0.0.15-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/LdFormList/index.js +103 -34
- package/es/utils/grid.js +3 -2
- package/lib/components/LdFormList/index.js +102 -33
- package/lib/utils/grid.js +3 -2
- package/package.json +1 -1
|
@@ -1,15 +1,18 @@
|
|
|
1
|
+
import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
|
2
|
+
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
1
3
|
import _extends from "@babel/runtime/helpers/esm/extends";
|
|
2
4
|
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
3
5
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
4
6
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
5
7
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
|
6
8
|
var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra"],
|
|
7
|
-
_excluded2 = ["
|
|
8
|
-
_excluded3 = ["
|
|
9
|
+
_excluded2 = ["readFieldProps", "dataSets", "doAction", "resources"],
|
|
10
|
+
_excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
|
|
11
|
+
_excluded4 = ["ldId", "initData", "overModel"];
|
|
9
12
|
import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState } from 'react';
|
|
10
13
|
import { connect, getDvaApp, useRouteMatch } from 'umi';
|
|
11
14
|
import PropTypes from 'prop-types';
|
|
12
|
-
import { useCreation, useMemoizedFn } from 'ahooks';
|
|
15
|
+
import { useCreation, useMemoizedFn, useAsyncEffect } from 'ahooks';
|
|
13
16
|
import { BasicDivider } from 'luck-design';
|
|
14
17
|
import { ChildrenUtil } from '@luck-design-biz/base/utils';
|
|
15
18
|
import { FormList, FormListAffix, FormBtn } from '@luck-design-biz/base/FormList';
|
|
@@ -21,6 +24,8 @@ import { LuckDaPopContext } from '../LdPop';
|
|
|
21
24
|
import createModel from './model';
|
|
22
25
|
import { onBatchSubmitAction } from '../../helper/action';
|
|
23
26
|
import { isArray, sortBy, mapValues } from 'lodash';
|
|
27
|
+
import { BpmButton } from '@luck-design-biz/base/bpm';
|
|
28
|
+
import { readBehaviorCall } from '../../services';
|
|
24
29
|
|
|
25
30
|
// 组件
|
|
26
31
|
var LdFormList = function LdFormList(_ref) {
|
|
@@ -52,12 +57,24 @@ var LdFormList = function LdFormList(_ref) {
|
|
|
52
57
|
_useState2 = _slicedToArray(_useState, 2),
|
|
53
58
|
submitLoading = _useState2[0],
|
|
54
59
|
setSubmitLoading = _useState2[1];
|
|
60
|
+
var _useState3 = useState(false),
|
|
61
|
+
_useState4 = _slicedToArray(_useState3, 2),
|
|
62
|
+
isCustomRenderAffixRight = _useState4[0],
|
|
63
|
+
setIsCustomRenderAffixRight = _useState4[1];
|
|
64
|
+
var _useState5 = useState({}),
|
|
65
|
+
_useState6 = _slicedToArray(_useState5, 2),
|
|
66
|
+
bizData = _useState6[0],
|
|
67
|
+
setBizData = _useState6[1];
|
|
55
68
|
var _ref2 = useContext(LuckDaPopContext) || {},
|
|
56
69
|
defaultLayout = _ref2.affixLayout;
|
|
57
|
-
var _ref3 = useContext(
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
70
|
+
var _ref3 = useContext(FormWindowContext) || {},
|
|
71
|
+
formWindow = _ref3.formWindow;
|
|
72
|
+
var _ref4 = useContext(LuckDaContext) || {},
|
|
73
|
+
readFieldProps = _ref4.readFieldProps,
|
|
74
|
+
dataSets = _ref4.dataSets,
|
|
75
|
+
doAction = _ref4.doAction,
|
|
76
|
+
resources = _ref4.resources,
|
|
77
|
+
rest = _objectWithoutProperties(_ref4, _excluded2);
|
|
61
78
|
var formListRef = useRef(null);
|
|
62
79
|
useImperativeHandle(wrapperRef, function () {
|
|
63
80
|
return _objectSpread(_objectSpread({}, formListRef.current), {}, {
|
|
@@ -77,8 +94,8 @@ var LdFormList = function LdFormList(_ref) {
|
|
|
77
94
|
});
|
|
78
95
|
});
|
|
79
96
|
var handleValueChange = useMemoizedFn(function (change) {
|
|
80
|
-
var
|
|
81
|
-
formRefs =
|
|
97
|
+
var _ref5 = formListRef.current || {},
|
|
98
|
+
formRefs = _ref5.formRefs;
|
|
82
99
|
var data = formRefs && Object.keys(formRefs).map(function (key) {
|
|
83
100
|
var _formRefs$key, _formRefs$key$formRef, _formRefs$key$current;
|
|
84
101
|
var getValue = (((_formRefs$key = formRefs[key]) === null || _formRefs$key === void 0 ? void 0 : (_formRefs$key$formRef = _formRefs$key.formRef) === null || _formRefs$key$formRef === void 0 ? void 0 : _formRefs$key$formRef.current) ? formRefs[key].getData : null) || ((_formRefs$key$current = formRefs[key].current) === null || _formRefs$key$current === void 0 ? void 0 : _formRefs$key$current.getFieldsValue);
|
|
@@ -92,11 +109,63 @@ var LdFormList = function LdFormList(_ref) {
|
|
|
92
109
|
formId: formId
|
|
93
110
|
}, extraConfig)));
|
|
94
111
|
});
|
|
112
|
+
|
|
113
|
+
/**zss添加**/
|
|
114
|
+
var renderAffixRightCustom = function renderAffixRightCustom() {
|
|
115
|
+
console.log('renderAffixRightCustom');
|
|
116
|
+
return /*#__PURE__*/React.createElement(React.Fragment, null, renderAffixRight && renderAffixRight(), /*#__PURE__*/React.createElement(BpmButton, {
|
|
117
|
+
bizData: bizData,
|
|
118
|
+
suppressDept: false
|
|
119
|
+
}));
|
|
120
|
+
};
|
|
121
|
+
useAsyncEffect( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
122
|
+
var _props$ticketData, _params, _yield$readBehaviorCa, code, data, _props$ticketData2, _props$ticketData3, bpmInfoObj, tempObj;
|
|
123
|
+
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
124
|
+
while (1) switch (_context.prev = _context.next) {
|
|
125
|
+
case 0:
|
|
126
|
+
if (!(formMode !== 'add')) {
|
|
127
|
+
_context.next = 8;
|
|
128
|
+
break;
|
|
129
|
+
}
|
|
130
|
+
_params = {
|
|
131
|
+
indocno: (_props$ticketData = props.ticketData) === null || _props$ticketData === void 0 ? void 0 : _props$ticketData.indocno,
|
|
132
|
+
moduleCode: rest.moduleCode,
|
|
133
|
+
datasetCode: mainDataSetKey,
|
|
134
|
+
mainDataSetKey: mainDataSetKey,
|
|
135
|
+
behaviorKey: 'readBpm'
|
|
136
|
+
};
|
|
137
|
+
_context.next = 4;
|
|
138
|
+
return readBehaviorCall(_params);
|
|
139
|
+
case 4:
|
|
140
|
+
_yield$readBehaviorCa = _context.sent;
|
|
141
|
+
code = _yield$readBehaviorCa.code;
|
|
142
|
+
data = _yield$readBehaviorCa.data;
|
|
143
|
+
if (code == 1 && data) {
|
|
144
|
+
bpmInfoObj = data.bpmInfo;
|
|
145
|
+
tempObj = {
|
|
146
|
+
bizKey: bpmInfoObj.bizKey,
|
|
147
|
+
sname: bpmInfoObj.name,
|
|
148
|
+
modelKey: bpmInfoObj.bpmKey,
|
|
149
|
+
// basekey : bpmInfoObj.buskey,
|
|
150
|
+
idocid: (_props$ticketData2 = props.ticketData) === null || _props$ticketData2 === void 0 ? void 0 : _props$ticketData2.indocno,
|
|
151
|
+
moduleCode: rest.moduleCode,
|
|
152
|
+
datasetCode: mainDataSetKey,
|
|
153
|
+
indocno: (_props$ticketData3 = props.ticketData) === null || _props$ticketData3 === void 0 ? void 0 : _props$ticketData3.indocno
|
|
154
|
+
};
|
|
155
|
+
setBizData(tempObj);
|
|
156
|
+
setIsCustomRenderAffixRight(true);
|
|
157
|
+
}
|
|
158
|
+
case 8:
|
|
159
|
+
case "end":
|
|
160
|
+
return _context.stop();
|
|
161
|
+
}
|
|
162
|
+
}, _callee);
|
|
163
|
+
})), []);
|
|
95
164
|
var handleBatchSubmit = function handleBatchSubmit(values, action) {
|
|
96
|
-
var
|
|
97
|
-
formCode =
|
|
98
|
-
formKey =
|
|
99
|
-
formUid =
|
|
165
|
+
var _ref8 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
|
|
166
|
+
formCode = _ref8.formCode,
|
|
167
|
+
formKey = _ref8.formKey,
|
|
168
|
+
formUid = _ref8.formUid;
|
|
100
169
|
setSubmitLoading(true);
|
|
101
170
|
onBatchSubmitAction({
|
|
102
171
|
values: values,
|
|
@@ -185,24 +254,24 @@ var LdFormList = function LdFormList(_ref) {
|
|
|
185
254
|
}), /*#__PURE__*/React.createElement(FormListAffix, {
|
|
186
255
|
showSaveBtn: !readOnly && showSaveBtn,
|
|
187
256
|
renderLeft: renderAffixLeft,
|
|
188
|
-
renderRight: renderAffixRight,
|
|
257
|
+
renderRight: isCustomRenderAffixRight ? renderAffixRightCustom : renderAffixRight,
|
|
189
258
|
title: saveBtnTitle,
|
|
190
259
|
layout: affixLayout || defaultLayout
|
|
191
260
|
}), formList.map(function (formProps) {
|
|
192
261
|
if (formProps.dataSetKey) {
|
|
193
|
-
var
|
|
194
|
-
ldId =
|
|
195
|
-
|
|
196
|
-
header =
|
|
197
|
-
title =
|
|
198
|
-
_readOnly =
|
|
199
|
-
|
|
200
|
-
extraConfig =
|
|
201
|
-
|
|
202
|
-
_renderTopLeft =
|
|
262
|
+
var _ref9 = formProps || {},
|
|
263
|
+
ldId = _ref9.id,
|
|
264
|
+
_ref9$header = _ref9.header,
|
|
265
|
+
header = _ref9$header === void 0 ? 'collapse' : _ref9$header,
|
|
266
|
+
title = _ref9.title,
|
|
267
|
+
_readOnly = _ref9.readOnly,
|
|
268
|
+
_ref9$extraConfig = _ref9.extraConfig,
|
|
269
|
+
extraConfig = _ref9$extraConfig === void 0 ? {} : _ref9$extraConfig,
|
|
270
|
+
_ref9$renderTopLeft = _ref9.renderTopLeft,
|
|
271
|
+
_renderTopLeft = _ref9$renderTopLeft === void 0 ? function () {
|
|
203
272
|
return /*#__PURE__*/React.createElement(React.Fragment, null);
|
|
204
|
-
} :
|
|
205
|
-
_props = _objectWithoutProperties(
|
|
273
|
+
} : _ref9$renderTopLeft,
|
|
274
|
+
_props = _objectWithoutProperties(_ref9, _excluded3);
|
|
206
275
|
var _props$type = _props.type,
|
|
207
276
|
type = _props$type === void 0 ? 'auto' : _props$type;
|
|
208
277
|
var renderForm = type === 'auto' ? buildLdAutoForm : buildLdGridForm;
|
|
@@ -262,9 +331,9 @@ var builder = function builder(WrappedComponent, namespace, initData) {
|
|
|
262
331
|
formMode: 'add'
|
|
263
332
|
}, initData)
|
|
264
333
|
});
|
|
265
|
-
return connect(function (
|
|
266
|
-
var modelName =
|
|
267
|
-
loading =
|
|
334
|
+
return connect(function (_ref10) {
|
|
335
|
+
var modelName = _ref10[namespace],
|
|
336
|
+
loading = _ref10.loading;
|
|
268
337
|
return {
|
|
269
338
|
formData: modelName.formData,
|
|
270
339
|
formOperates: modelName.formOperates,
|
|
@@ -275,11 +344,11 @@ var builder = function builder(WrappedComponent, namespace, initData) {
|
|
|
275
344
|
};
|
|
276
345
|
})(WrappedComponent);
|
|
277
346
|
};
|
|
278
|
-
var Index = function Index(
|
|
279
|
-
var namespace =
|
|
280
|
-
initData =
|
|
281
|
-
overModel =
|
|
282
|
-
props = _objectWithoutProperties(
|
|
347
|
+
var Index = function Index(_ref11) {
|
|
348
|
+
var namespace = _ref11.ldId,
|
|
349
|
+
initData = _ref11.initData,
|
|
350
|
+
overModel = _ref11.overModel,
|
|
351
|
+
props = _objectWithoutProperties(_ref11, _excluded4);
|
|
283
352
|
var match = useRouteMatch();
|
|
284
353
|
var Component = useCreation(function () {
|
|
285
354
|
var _getDvaApp3, _getDvaApp4, _match$params;
|
package/es/utils/grid.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
1
2
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
|
2
3
|
var _excluded = ["comName", "property"],
|
|
3
4
|
_excluded2 = ["name"],
|
|
@@ -95,11 +96,11 @@ export var getGridColumn = function getGridColumn() {
|
|
|
95
96
|
filter = _merge.filter,
|
|
96
97
|
filterParams = _merge.filterParams,
|
|
97
98
|
_props = _objectWithoutProperties(_merge, _excluded3);
|
|
98
|
-
var data = {
|
|
99
|
+
var data = _objectSpread(_objectSpread({}, _props), {}, {
|
|
99
100
|
field: name,
|
|
100
101
|
title: _props.label,
|
|
101
102
|
render: _props.render || getColumnRender(name, comName || defaultComName[property], _props)
|
|
102
|
-
};
|
|
103
|
+
});
|
|
103
104
|
if (isTreeGrid || isVirtual || includes(['user', 'select', 'group', 'switch', 'color', 'region'], comName || defaultComName[property])) data.sortable = false;
|
|
104
105
|
// data.filter = false;
|
|
105
106
|
if (!isNil(filter)) {
|
|
@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
8
|
exports.default = void 0;
|
|
9
|
+
var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
|
|
10
|
+
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
9
11
|
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
10
12
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
11
13
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
|
@@ -26,9 +28,12 @@ var _LdPop = require("../LdPop");
|
|
|
26
28
|
var _model = _interopRequireDefault(require("./model"));
|
|
27
29
|
var _action = require("../../helper/action");
|
|
28
30
|
var _lodash = require("lodash");
|
|
31
|
+
var _bpm = require("@luck-design-biz/base/bpm");
|
|
32
|
+
var _services = require("../../services");
|
|
29
33
|
var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra"],
|
|
30
|
-
_excluded2 = ["
|
|
31
|
-
_excluded3 = ["
|
|
34
|
+
_excluded2 = ["readFieldProps", "dataSets", "doAction", "resources"],
|
|
35
|
+
_excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
|
|
36
|
+
_excluded4 = ["ldId", "initData", "overModel"];
|
|
32
37
|
// 组件
|
|
33
38
|
var LdFormList = function LdFormList(_ref) {
|
|
34
39
|
var _formList$find;
|
|
@@ -59,12 +64,24 @@ var LdFormList = function LdFormList(_ref) {
|
|
|
59
64
|
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
60
65
|
submitLoading = _useState2[0],
|
|
61
66
|
setSubmitLoading = _useState2[1];
|
|
67
|
+
var _useState3 = (0, _react.useState)(false),
|
|
68
|
+
_useState4 = (0, _slicedToArray2.default)(_useState3, 2),
|
|
69
|
+
isCustomRenderAffixRight = _useState4[0],
|
|
70
|
+
setIsCustomRenderAffixRight = _useState4[1];
|
|
71
|
+
var _useState5 = (0, _react.useState)({}),
|
|
72
|
+
_useState6 = (0, _slicedToArray2.default)(_useState5, 2),
|
|
73
|
+
bizData = _useState6[0],
|
|
74
|
+
setBizData = _useState6[1];
|
|
62
75
|
var _ref2 = (0, _react.useContext)(_LdPop.LuckDaPopContext) || {},
|
|
63
76
|
defaultLayout = _ref2.affixLayout;
|
|
64
|
-
var _ref3 = (0, _react.useContext)(
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
77
|
+
var _ref3 = (0, _react.useContext)(FormWindowContext) || {},
|
|
78
|
+
formWindow = _ref3.formWindow;
|
|
79
|
+
var _ref4 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
|
|
80
|
+
readFieldProps = _ref4.readFieldProps,
|
|
81
|
+
dataSets = _ref4.dataSets,
|
|
82
|
+
doAction = _ref4.doAction,
|
|
83
|
+
resources = _ref4.resources,
|
|
84
|
+
rest = (0, _objectWithoutProperties2.default)(_ref4, _excluded2);
|
|
68
85
|
var formListRef = (0, _react.useRef)(null);
|
|
69
86
|
(0, _react.useImperativeHandle)(wrapperRef, function () {
|
|
70
87
|
return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, formListRef.current), {}, {
|
|
@@ -84,8 +101,8 @@ var LdFormList = function LdFormList(_ref) {
|
|
|
84
101
|
});
|
|
85
102
|
});
|
|
86
103
|
var handleValueChange = (0, _ahooks.useMemoizedFn)(function (change) {
|
|
87
|
-
var
|
|
88
|
-
formRefs =
|
|
104
|
+
var _ref5 = formListRef.current || {},
|
|
105
|
+
formRefs = _ref5.formRefs;
|
|
89
106
|
var data = formRefs && Object.keys(formRefs).map(function (key) {
|
|
90
107
|
var _formRefs$key, _formRefs$key$formRef, _formRefs$key$current;
|
|
91
108
|
var getValue = (((_formRefs$key = formRefs[key]) === null || _formRefs$key === void 0 ? void 0 : (_formRefs$key$formRef = _formRefs$key.formRef) === null || _formRefs$key$formRef === void 0 ? void 0 : _formRefs$key$formRef.current) ? formRefs[key].getData : null) || ((_formRefs$key$current = formRefs[key].current) === null || _formRefs$key$current === void 0 ? void 0 : _formRefs$key$current.getFieldsValue);
|
|
@@ -99,11 +116,63 @@ var LdFormList = function LdFormList(_ref) {
|
|
|
99
116
|
formId: formId
|
|
100
117
|
}, extraConfig)));
|
|
101
118
|
});
|
|
119
|
+
|
|
120
|
+
/**zss添加**/
|
|
121
|
+
var renderAffixRightCustom = function renderAffixRightCustom() {
|
|
122
|
+
console.log('renderAffixRightCustom');
|
|
123
|
+
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderAffixRight && renderAffixRight(), /*#__PURE__*/_react.default.createElement(_bpm.BpmButton, {
|
|
124
|
+
bizData: bizData,
|
|
125
|
+
suppressDept: false
|
|
126
|
+
}));
|
|
127
|
+
};
|
|
128
|
+
(0, _ahooks.useAsyncEffect)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
|
|
129
|
+
var _props$ticketData, _params, _yield$readBehaviorCa, code, data, _props$ticketData2, _props$ticketData3, bpmInfoObj, tempObj;
|
|
130
|
+
return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
|
|
131
|
+
while (1) switch (_context.prev = _context.next) {
|
|
132
|
+
case 0:
|
|
133
|
+
if (!(formMode !== 'add')) {
|
|
134
|
+
_context.next = 8;
|
|
135
|
+
break;
|
|
136
|
+
}
|
|
137
|
+
_params = {
|
|
138
|
+
indocno: (_props$ticketData = props.ticketData) === null || _props$ticketData === void 0 ? void 0 : _props$ticketData.indocno,
|
|
139
|
+
moduleCode: rest.moduleCode,
|
|
140
|
+
datasetCode: mainDataSetKey,
|
|
141
|
+
mainDataSetKey: mainDataSetKey,
|
|
142
|
+
behaviorKey: 'readBpm'
|
|
143
|
+
};
|
|
144
|
+
_context.next = 4;
|
|
145
|
+
return (0, _services.readBehaviorCall)(_params);
|
|
146
|
+
case 4:
|
|
147
|
+
_yield$readBehaviorCa = _context.sent;
|
|
148
|
+
code = _yield$readBehaviorCa.code;
|
|
149
|
+
data = _yield$readBehaviorCa.data;
|
|
150
|
+
if (code == 1 && data) {
|
|
151
|
+
bpmInfoObj = data.bpmInfo;
|
|
152
|
+
tempObj = {
|
|
153
|
+
bizKey: bpmInfoObj.bizKey,
|
|
154
|
+
sname: bpmInfoObj.name,
|
|
155
|
+
modelKey: bpmInfoObj.bpmKey,
|
|
156
|
+
// basekey : bpmInfoObj.buskey,
|
|
157
|
+
idocid: (_props$ticketData2 = props.ticketData) === null || _props$ticketData2 === void 0 ? void 0 : _props$ticketData2.indocno,
|
|
158
|
+
moduleCode: rest.moduleCode,
|
|
159
|
+
datasetCode: mainDataSetKey,
|
|
160
|
+
indocno: (_props$ticketData3 = props.ticketData) === null || _props$ticketData3 === void 0 ? void 0 : _props$ticketData3.indocno
|
|
161
|
+
};
|
|
162
|
+
setBizData(tempObj);
|
|
163
|
+
setIsCustomRenderAffixRight(true);
|
|
164
|
+
}
|
|
165
|
+
case 8:
|
|
166
|
+
case "end":
|
|
167
|
+
return _context.stop();
|
|
168
|
+
}
|
|
169
|
+
}, _callee);
|
|
170
|
+
})), []);
|
|
102
171
|
var handleBatchSubmit = function handleBatchSubmit(values, action) {
|
|
103
|
-
var
|
|
104
|
-
formCode =
|
|
105
|
-
formKey =
|
|
106
|
-
formUid =
|
|
172
|
+
var _ref8 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
|
|
173
|
+
formCode = _ref8.formCode,
|
|
174
|
+
formKey = _ref8.formKey,
|
|
175
|
+
formUid = _ref8.formUid;
|
|
107
176
|
setSubmitLoading(true);
|
|
108
177
|
(0, _action.onBatchSubmitAction)({
|
|
109
178
|
values: values,
|
|
@@ -192,24 +261,24 @@ var LdFormList = function LdFormList(_ref) {
|
|
|
192
261
|
}), /*#__PURE__*/_react.default.createElement(_FormList.FormListAffix, {
|
|
193
262
|
showSaveBtn: !readOnly && showSaveBtn,
|
|
194
263
|
renderLeft: renderAffixLeft,
|
|
195
|
-
renderRight: renderAffixRight,
|
|
264
|
+
renderRight: isCustomRenderAffixRight ? renderAffixRightCustom : renderAffixRight,
|
|
196
265
|
title: saveBtnTitle,
|
|
197
266
|
layout: affixLayout || defaultLayout
|
|
198
267
|
}), formList.map(function (formProps) {
|
|
199
268
|
if (formProps.dataSetKey) {
|
|
200
|
-
var
|
|
201
|
-
ldId =
|
|
202
|
-
|
|
203
|
-
header =
|
|
204
|
-
title =
|
|
205
|
-
_readOnly =
|
|
206
|
-
|
|
207
|
-
extraConfig =
|
|
208
|
-
|
|
209
|
-
_renderTopLeft =
|
|
269
|
+
var _ref9 = formProps || {},
|
|
270
|
+
ldId = _ref9.id,
|
|
271
|
+
_ref9$header = _ref9.header,
|
|
272
|
+
header = _ref9$header === void 0 ? 'collapse' : _ref9$header,
|
|
273
|
+
title = _ref9.title,
|
|
274
|
+
_readOnly = _ref9.readOnly,
|
|
275
|
+
_ref9$extraConfig = _ref9.extraConfig,
|
|
276
|
+
extraConfig = _ref9$extraConfig === void 0 ? {} : _ref9$extraConfig,
|
|
277
|
+
_ref9$renderTopLeft = _ref9.renderTopLeft,
|
|
278
|
+
_renderTopLeft = _ref9$renderTopLeft === void 0 ? function () {
|
|
210
279
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
|
|
211
|
-
} :
|
|
212
|
-
_props = (0, _objectWithoutProperties2.default)(
|
|
280
|
+
} : _ref9$renderTopLeft,
|
|
281
|
+
_props = (0, _objectWithoutProperties2.default)(_ref9, _excluded3);
|
|
213
282
|
var _props$type = _props.type,
|
|
214
283
|
type = _props$type === void 0 ? 'auto' : _props$type;
|
|
215
284
|
var renderForm = type === 'auto' ? _LdAutoForm.default : _LdGridForm.default;
|
|
@@ -269,9 +338,9 @@ var builder = function builder(WrappedComponent, namespace, initData) {
|
|
|
269
338
|
formMode: 'add'
|
|
270
339
|
}, initData)
|
|
271
340
|
});
|
|
272
|
-
return (0, _umi.connect)(function (
|
|
273
|
-
var modelName =
|
|
274
|
-
loading =
|
|
341
|
+
return (0, _umi.connect)(function (_ref10) {
|
|
342
|
+
var modelName = _ref10[namespace],
|
|
343
|
+
loading = _ref10.loading;
|
|
275
344
|
return {
|
|
276
345
|
formData: modelName.formData,
|
|
277
346
|
formOperates: modelName.formOperates,
|
|
@@ -282,11 +351,11 @@ var builder = function builder(WrappedComponent, namespace, initData) {
|
|
|
282
351
|
};
|
|
283
352
|
})(WrappedComponent);
|
|
284
353
|
};
|
|
285
|
-
var Index = function Index(
|
|
286
|
-
var namespace =
|
|
287
|
-
initData =
|
|
288
|
-
overModel =
|
|
289
|
-
props = (0, _objectWithoutProperties2.default)(
|
|
354
|
+
var Index = function Index(_ref11) {
|
|
355
|
+
var namespace = _ref11.ldId,
|
|
356
|
+
initData = _ref11.initData,
|
|
357
|
+
overModel = _ref11.overModel,
|
|
358
|
+
props = (0, _objectWithoutProperties2.default)(_ref11, _excluded4);
|
|
290
359
|
var match = (0, _umi.useRouteMatch)();
|
|
291
360
|
var Component = (0, _ahooks.useCreation)(function () {
|
|
292
361
|
var _getDvaApp3, _getDvaApp4, _match$params;
|
package/lib/utils/grid.js
CHANGED
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.getColumnRender = getColumnRender;
|
|
8
8
|
exports.getGridColumn = void 0;
|
|
9
|
+
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
|
9
10
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
|
10
11
|
var _react = _interopRequireDefault(require("react"));
|
|
11
12
|
var _umi = require("umi");
|
|
@@ -102,11 +103,11 @@ var getGridColumn = function getGridColumn() {
|
|
|
102
103
|
filter = _merge.filter,
|
|
103
104
|
filterParams = _merge.filterParams,
|
|
104
105
|
_props = (0, _objectWithoutProperties2.default)(_merge, _excluded3);
|
|
105
|
-
var data = {
|
|
106
|
+
var data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
|
|
106
107
|
field: name,
|
|
107
108
|
title: _props.label,
|
|
108
109
|
render: _props.render || getColumnRender(name, comName || _form.defaultComName[property], _props)
|
|
109
|
-
};
|
|
110
|
+
});
|
|
110
111
|
if (isTreeGrid || isVirtual || (0, _lodash.includes)(['user', 'select', 'group', 'switch', 'color', 'region'], comName || _form.defaultComName[property])) data.sortable = false;
|
|
111
112
|
// data.filter = false;
|
|
112
113
|
if (!(0, _lodash.isNil)(filter)) {
|