@luck-design-biz/luckda 0.0.21 → 0.0.22-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.
- package/README.md +21 -30
- package/es/components/Builder/index.js +3 -3
- package/es/components/LdAutoForm/index.js +7 -9
- package/es/components/LdCard/index.js +6 -7
- package/es/components/LdCard/model.js +1 -1
- package/es/components/LdCom/index.js +3 -3
- package/es/components/LdFormList/index.js +15 -16
- package/es/components/LdGrid/index.js +7 -8
- package/es/components/LdGrid/model.js +1 -1
- package/es/components/LdGridForm/index.js +10 -10
- package/es/components/LdInfoPanel/index.js +2 -2
- package/es/components/LdTree/index.js +4 -5
- package/es/helper/FromItems.js +1 -1
- package/es/helper/action.js +3 -3
- package/es/helper/form.js +2 -2
- package/es/helper/ldBuilder.js +1 -1
- package/es/helper/ldComBuild.js +4 -4
- package/es/index.js +9 -9
- package/es/services.js +1 -1
- package/es/upload/Form/gridForm.js +20 -15
- package/es/upload/Form/index.js +3 -2
- package/es/upload/FormItem/index.js +0 -0
- package/es/upload/GridCell/index.js +1 -1
- package/es/upload/index.js +3 -3
- package/es/utils/action.js +1 -1
- package/es/utils/form.js +4 -4
- package/es/utils/grid.js +24 -26
- package/es/utils/index.js +3 -3
- package/lib/components/Builder/index.js +2 -4
- package/lib/components/LdAutoForm/index.js +5 -8
- package/lib/components/LdCard/index.js +6 -8
- package/lib/components/LdCom/index.js +7 -12
- package/lib/components/LdFormList/index.js +10 -12
- package/lib/components/LdGrid/index.js +6 -8
- package/lib/components/LdGridForm/index.js +6 -7
- package/lib/components/LdInfoPanel/index.js +2 -3
- package/lib/components/LdPop/index.js +2 -4
- package/lib/components/LdTree/index.js +3 -5
- package/lib/helper/FromItems.js +15 -29
- package/lib/helper/action.js +4 -6
- package/lib/helper/form.js +4 -6
- package/lib/helper/ldBuilder.js +1 -2
- package/lib/helper/ldComBuild.js +7 -11
- package/lib/services.js +1 -1
- package/lib/upload/Form/gridForm.js +21 -17
- package/lib/upload/Form/index.js +3 -3
- package/lib/upload/FormItem/index.js +1 -2
- package/lib/upload/GridCell/index.js +2 -3
- package/lib/utils/form.js +5 -8
- package/lib/utils/grid.js +26 -29
- package/package.json +96 -23
- package/README.zh-CN.md +0 -51
|
@@ -6,11 +6,11 @@ var _excluded = ["formId", "formRef", "showNote", "operates", "loading", "upload
|
|
|
6
6
|
import React, { useState, useRef, forwardRef } from 'react';
|
|
7
7
|
import { getDvaApp } from 'umi';
|
|
8
8
|
import { useMemoizedFn } from 'ahooks';
|
|
9
|
-
import { Button, Upload, Tooltip, Icon } from 'antd';
|
|
9
|
+
import { Button, Upload, Tooltip, Icon } from 'luck-design/antd';
|
|
10
10
|
import moment from 'moment';
|
|
11
11
|
import { last } from 'lodash';
|
|
12
12
|
import { BasicForm, BasicFormItem, PopWindow } from 'luck-design';
|
|
13
|
-
import api from
|
|
13
|
+
import api from "../../../src/services/ApiConfig";
|
|
14
14
|
import { FormBtn, GridForm } from '@luck-design-biz/base/FormList';
|
|
15
15
|
import { byteConvert, formatMessage, beforeUpload as _beforeUpload2, patchDownloadZip, showPop, request, canPreview } from '@luck-design-biz/base/utils';
|
|
16
16
|
var columns = [{
|
|
@@ -114,17 +114,17 @@ var UploadGridForm = function UploadGridForm(_ref) {
|
|
|
114
114
|
}
|
|
115
115
|
if (file.status === 'done' && file.response && file.response.code === 1) {
|
|
116
116
|
var _file$response2 = file.response,
|
|
117
|
-
|
|
118
|
-
|
|
117
|
+
list = _file$response2.list,
|
|
118
|
+
detail = _file$response2.detail;
|
|
119
119
|
var data = {
|
|
120
|
-
uid:
|
|
120
|
+
uid: detail[list[0]].fileName,
|
|
121
121
|
name: file.name,
|
|
122
122
|
size: file.size,
|
|
123
|
-
fileId:
|
|
124
|
-
stype:
|
|
123
|
+
fileId: detail[list[0]].fileName,
|
|
124
|
+
stype: detail[list[0]].fileExt,
|
|
125
125
|
username: currentUser && currentUser.sname,
|
|
126
126
|
uploadDate: moment().valueOf(),
|
|
127
|
-
previewUrl:
|
|
127
|
+
previewUrl: detail[list[0]].previewUrl
|
|
128
128
|
};
|
|
129
129
|
gridRef.current.changeData(null, data);
|
|
130
130
|
}
|
|
@@ -157,17 +157,19 @@ var UploadGridForm = function UploadGridForm(_ref) {
|
|
|
157
157
|
data: formData
|
|
158
158
|
}).then(function (res) {
|
|
159
159
|
var code = res.code,
|
|
160
|
-
|
|
160
|
+
list = res.list,
|
|
161
|
+
detail = res.detail,
|
|
162
|
+
msg = res.msg;
|
|
161
163
|
if (code === 1) {
|
|
162
164
|
setUploadLoading(false);
|
|
163
165
|
setVisible(false);
|
|
164
|
-
|
|
166
|
+
list.forEach(function (i, index) {
|
|
165
167
|
var data = {
|
|
166
|
-
uid: detail[
|
|
167
|
-
name:
|
|
168
|
-
size:
|
|
169
|
-
stype:
|
|
170
|
-
fileId: detail[
|
|
168
|
+
uid: detail[i].fileName,
|
|
169
|
+
name: detail[i].origFileName,
|
|
170
|
+
size: detail[i].fileSize,
|
|
171
|
+
stype: detail[i].fileExt,
|
|
172
|
+
fileId: detail[i].fileName,
|
|
171
173
|
username: currentUser && currentUser.sname,
|
|
172
174
|
note: snote,
|
|
173
175
|
uploadDate: moment().valueOf(),
|
|
@@ -184,6 +186,9 @@ var UploadGridForm = function UploadGridForm(_ref) {
|
|
|
184
186
|
}, 300);
|
|
185
187
|
}
|
|
186
188
|
});
|
|
189
|
+
} else {
|
|
190
|
+
setUploadLoading(false);
|
|
191
|
+
showPop(msg, null, 'error');
|
|
187
192
|
}
|
|
188
193
|
});
|
|
189
194
|
}
|
package/es/upload/Form/index.js
CHANGED
|
@@ -4,7 +4,7 @@ var _excluded = ["formId", "moduleCode", "bucket", "note"];
|
|
|
4
4
|
import React from 'react';
|
|
5
5
|
import { omitBy, isNil } from 'lodash';
|
|
6
6
|
import { stringify } from 'querystring';
|
|
7
|
-
import GridForm from
|
|
7
|
+
import GridForm from "./gridForm";
|
|
8
8
|
import { request } from '@luck-design-biz/base/utils';
|
|
9
9
|
function buildComponent(props) {
|
|
10
10
|
var _formId = props.formId,
|
|
@@ -55,7 +55,8 @@ function buildComponent(props) {
|
|
|
55
55
|
stype: i.fileExt,
|
|
56
56
|
username: i.sregnm,
|
|
57
57
|
uploadDate: i.dregt,
|
|
58
|
-
previewUrl: i.previewUrl
|
|
58
|
+
previewUrl: i.previewUrl,
|
|
59
|
+
note: i.note
|
|
59
60
|
};
|
|
60
61
|
});
|
|
61
62
|
}
|
|
File without changes
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { Popover, Icon } from 'antd';
|
|
2
|
+
import { Popover, Icon } from 'luck-design/antd';
|
|
3
3
|
var UploadGridCell = function UploadGridCell(_ref) {
|
|
4
4
|
var _ref$fileList = _ref.fileList,
|
|
5
5
|
fileList = _ref$fileList === void 0 ? [] : _ref$fileList,
|
package/es/upload/index.js
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
export { default as buildUploadForm } from
|
|
2
|
-
export { default as buildUploadFormItem } from
|
|
3
|
-
export { default as UploadGridCell } from
|
|
1
|
+
export { default as buildUploadForm } from "./Form";
|
|
2
|
+
export { default as buildUploadFormItem } from "./FormItem";
|
|
3
|
+
export { default as UploadGridCell } from "./GridCell";
|
package/es/utils/action.js
CHANGED
|
@@ -2,7 +2,7 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
|
|
2
2
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
3
3
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
4
4
|
// 行为请求同一接口
|
|
5
|
-
import { readBehaviorCall } from
|
|
5
|
+
import { readBehaviorCall } from "../services";
|
|
6
6
|
export function behaviorCall() {
|
|
7
7
|
return _behaviorCall.apply(this, arguments);
|
|
8
8
|
}
|
package/es/utils/form.js
CHANGED
|
@@ -13,10 +13,10 @@ var _excluded = ["comName", "property"],
|
|
|
13
13
|
import React from 'react';
|
|
14
14
|
import moment from 'moment';
|
|
15
15
|
import { capitalize, merge, transform, isArray, omit, isNil, clone } from 'lodash';
|
|
16
|
-
import api from
|
|
17
|
-
import { defaultComName, translator, splitStrToObj, formatCustomProps } from
|
|
18
|
-
import { getColumnRender } from
|
|
19
|
-
import * as formItemUtils from
|
|
16
|
+
import api from "../../src/services/ApiConfig";
|
|
17
|
+
import { defaultComName, translator, splitStrToObj, formatCustomProps } from "../helper/form";
|
|
18
|
+
import { getColumnRender } from "./grid";
|
|
19
|
+
import * as formItemUtils from "../helper/FromItems";
|
|
20
20
|
|
|
21
21
|
/**
|
|
22
22
|
* 根据动态表单配置项生成formItem
|
package/es/utils/grid.js
CHANGED
|
@@ -4,16 +4,15 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
|
|
|
4
4
|
var _excluded = ["comName", "property"],
|
|
5
5
|
_excluded2 = ["name"],
|
|
6
6
|
_excluded3 = ["filter", "filterParams"];
|
|
7
|
-
import React from "react";
|
|
8
7
|
import { getDvaApp } from 'umi';
|
|
9
8
|
import { merge, isNil, isArray, includes, capitalize } from 'lodash';
|
|
10
|
-
import { Switch, Tag } from 'antd';
|
|
9
|
+
import { Switch, Tag } from 'luck-design/antd';
|
|
11
10
|
import moment from 'moment';
|
|
12
|
-
import UploadGridCell from
|
|
11
|
+
import UploadGridCell from "../upload/GridCell";
|
|
13
12
|
import { formatMessage } from '@luck-design-biz/base/utils';
|
|
14
|
-
import api from
|
|
15
|
-
import { defaultComName, translator, formatCustomProps, splitStrToObj } from
|
|
16
|
-
import * as formItemUtils from
|
|
13
|
+
import api from "../../src/services/ApiConfig";
|
|
14
|
+
import { defaultComName, translator, formatCustomProps, splitStrToObj } from "../helper/form";
|
|
15
|
+
import * as formItemUtils from "../helper/FromItems";
|
|
17
16
|
|
|
18
17
|
// const { dispatch } = getDvaApp()?._store;
|
|
19
18
|
|
|
@@ -28,7 +27,7 @@ export function getColumnRender(name, type) {
|
|
|
28
27
|
case 'textarea':
|
|
29
28
|
render = function render(text, record) {
|
|
30
29
|
var _props$config;
|
|
31
|
-
return record["".concat(name, "_virtual")] || ((
|
|
30
|
+
return record["".concat(name, "_virtual")] || ((_props$config = props.config) !== null && _props$config !== void 0 && _props$config.precision && text ? Number(text).toFixed(props.config.precision) : text);
|
|
32
31
|
};
|
|
33
32
|
break;
|
|
34
33
|
case 'date':
|
|
@@ -126,7 +125,7 @@ export var getGridColumn = function getGridColumn() {
|
|
|
126
125
|
filter = _merge.filter,
|
|
127
126
|
filterParams = _merge.filterParams,
|
|
128
127
|
_props = _objectWithoutProperties(_merge, _excluded3);
|
|
129
|
-
var _extra = JSON.parse(extra);
|
|
128
|
+
var _extra = JSON.parse(extra) || {};
|
|
130
129
|
var data = _objectSpread(_objectSpread({}, _props), {}, {
|
|
131
130
|
field: name,
|
|
132
131
|
title: _props.label,
|
|
@@ -175,14 +174,14 @@ export var getGridColumn = function getGridColumn() {
|
|
|
175
174
|
data.filter = 'select';
|
|
176
175
|
data.filterParams = {
|
|
177
176
|
options: function options() {
|
|
178
|
-
var _getDvaApp
|
|
179
|
-
return (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0
|
|
177
|
+
var _getDvaApp;
|
|
178
|
+
return (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 || (_getDvaApp = _getDvaApp._store) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp.dispatch({
|
|
180
179
|
type: 'global/getUser'
|
|
181
180
|
});
|
|
182
181
|
},
|
|
183
182
|
searchData: function searchData(str) {
|
|
184
|
-
var _getDvaApp2
|
|
185
|
-
return (_getDvaApp2 = getDvaApp()) === null || _getDvaApp2 === void 0
|
|
183
|
+
var _getDvaApp2;
|
|
184
|
+
return (_getDvaApp2 = getDvaApp()) === null || _getDvaApp2 === void 0 || (_getDvaApp2 = _getDvaApp2._store) === null || _getDvaApp2 === void 0 ? void 0 : _getDvaApp2.dispatch({
|
|
186
185
|
type: "global/getUser",
|
|
187
186
|
payload: str
|
|
188
187
|
});
|
|
@@ -197,8 +196,8 @@ export var getGridColumn = function getGridColumn() {
|
|
|
197
196
|
if (_props.alias) {
|
|
198
197
|
data.filterParams = {
|
|
199
198
|
options: function options() {
|
|
200
|
-
var _getDvaApp3
|
|
201
|
-
return (_getDvaApp3 = getDvaApp()) === null || _getDvaApp3 === void 0
|
|
199
|
+
var _getDvaApp3;
|
|
200
|
+
return (_getDvaApp3 = getDvaApp()) === null || _getDvaApp3 === void 0 || (_getDvaApp3 = _getDvaApp3._store) === null || _getDvaApp3 === void 0 ? void 0 : _getDvaApp3.dispatch({
|
|
202
201
|
type: 'global/getDatadic',
|
|
203
202
|
payload: {
|
|
204
203
|
snamealias: _props.alias
|
|
@@ -213,8 +212,8 @@ export var getGridColumn = function getGridColumn() {
|
|
|
213
212
|
data.filter = 'treeSelect';
|
|
214
213
|
data.filterParams = {
|
|
215
214
|
options: function options() {
|
|
216
|
-
var _getDvaApp4
|
|
217
|
-
return (_getDvaApp4 = getDvaApp()) === null || _getDvaApp4 === void 0
|
|
215
|
+
var _getDvaApp4;
|
|
216
|
+
return (_getDvaApp4 = getDvaApp()) === null || _getDvaApp4 === void 0 || (_getDvaApp4 = _getDvaApp4._store) === null || _getDvaApp4 === void 0 ? void 0 : _getDvaApp4.dispatch({
|
|
218
217
|
type: 'global/readGroup',
|
|
219
218
|
payload: {
|
|
220
219
|
sclassKey: _props.sclassKey
|
|
@@ -222,8 +221,8 @@ export var getGridColumn = function getGridColumn() {
|
|
|
222
221
|
});
|
|
223
222
|
},
|
|
224
223
|
searchData: function searchData(str) {
|
|
225
|
-
var _getDvaApp5
|
|
226
|
-
return (_getDvaApp5 = getDvaApp()) === null || _getDvaApp5 === void 0
|
|
224
|
+
var _getDvaApp5;
|
|
225
|
+
return (_getDvaApp5 = getDvaApp()) === null || _getDvaApp5 === void 0 || (_getDvaApp5 = _getDvaApp5._store) === null || _getDvaApp5 === void 0 ? void 0 : _getDvaApp5.dispatch({
|
|
227
226
|
type: 'global/readGroup',
|
|
228
227
|
payload: {
|
|
229
228
|
sclassKey: _props.sclassKey,
|
|
@@ -235,6 +234,8 @@ export var getGridColumn = function getGridColumn() {
|
|
|
235
234
|
};
|
|
236
235
|
break;
|
|
237
236
|
case 'upload':
|
|
237
|
+
case 'textarea':
|
|
238
|
+
case 'editor':
|
|
238
239
|
data.filter = false;
|
|
239
240
|
break;
|
|
240
241
|
default:
|
|
@@ -253,8 +254,7 @@ export var getGridColumn = function getGridColumn() {
|
|
|
253
254
|
case 'date':
|
|
254
255
|
formItemProps = {
|
|
255
256
|
dataFormat: function dataFormat(value) {
|
|
256
|
-
|
|
257
|
-
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;
|
|
257
|
+
return _defineProperty(_defineProperty({}, name, value ? moment(value).valueOf() : undefined), "".concat(name, "_virtual"), value ? moment(value).format('YYYY-MM-DD HH:mm:ss') : undefined);
|
|
258
258
|
},
|
|
259
259
|
inputFormat: function inputFormat(value, record, params) {
|
|
260
260
|
return moment(record["".concat(name, "_virtual")], 'YYYY-MM-DD HH:mm:ss');
|
|
@@ -267,12 +267,11 @@ export var getGridColumn = function getGridColumn() {
|
|
|
267
267
|
if (translateProps.multiple) {
|
|
268
268
|
formItemProps = {
|
|
269
269
|
dataFormat: function dataFormat(value) {
|
|
270
|
-
|
|
271
|
-
return _ref3 = {}, _defineProperty(_ref3, name, value.map(function (v) {
|
|
270
|
+
return _defineProperty(_defineProperty({}, name, value.map(function (v) {
|
|
272
271
|
return v.value || v.key;
|
|
273
|
-
}).join(',')),
|
|
272
|
+
}).join(',')), "".concat(name, "_virtual"), value.map(function (v) {
|
|
274
273
|
return v.label;
|
|
275
|
-
}).join(','))
|
|
274
|
+
}).join(','));
|
|
276
275
|
},
|
|
277
276
|
inputFormat: function inputFormat(value, record, params) {
|
|
278
277
|
return _defineProperty({}, name, splitStrToObj(value, record["".concat(name, "_virtual")]));
|
|
@@ -281,8 +280,7 @@ export var getGridColumn = function getGridColumn() {
|
|
|
281
280
|
} else {
|
|
282
281
|
formItemProps = {
|
|
283
282
|
dataFormat: function dataFormat(value) {
|
|
284
|
-
|
|
285
|
-
return _ref5 = {}, _defineProperty(_ref5, name, value ? value.value || value.key : undefined), _defineProperty(_ref5, "".concat(name, "_virtual"), value ? value.label : undefined), _ref5;
|
|
283
|
+
return _defineProperty(_defineProperty({}, name, value ? value.value || value.key : undefined), "".concat(name, "_virtual"), value ? value.label : undefined);
|
|
286
284
|
},
|
|
287
285
|
inputFormat: function inputFormat(value, record, params) {
|
|
288
286
|
return _defineProperty({}, name, !isNil(value) ? {
|
package/es/utils/index.js
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
export * from
|
|
2
|
-
export * from
|
|
3
|
-
export * from
|
|
1
|
+
export * from "./grid";
|
|
2
|
+
export * from "./form";
|
|
3
|
+
export * from "./action";
|
|
@@ -17,8 +17,7 @@ var _LdPop = _interopRequireDefault(require("../LdPop"));
|
|
|
17
17
|
var _services = require("../../services");
|
|
18
18
|
var _action2 = require("../../helper/action");
|
|
19
19
|
var _utils = require("@luck-design-biz/base/utils");
|
|
20
|
-
var LuckDaContext = /*#__PURE__*/(0, _react.createContext)();
|
|
21
|
-
exports.LuckDaContext = LuckDaContext;
|
|
20
|
+
var LuckDaContext = exports.LuckDaContext = /*#__PURE__*/(0, _react.createContext)();
|
|
22
21
|
var builder = function builder(WrappedComponent, moduleCode) {
|
|
23
22
|
var Component = function Component(props) {
|
|
24
23
|
if (!moduleCode) return (0, _utils.formatMessage)({
|
|
@@ -138,5 +137,4 @@ var builder = function builder(WrappedComponent, moduleCode) {
|
|
|
138
137
|
};
|
|
139
138
|
return Component;
|
|
140
139
|
};
|
|
141
|
-
var _default = builder;
|
|
142
|
-
exports.default = _default;
|
|
140
|
+
var _default = exports.default = builder;
|
|
@@ -58,11 +58,10 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
|
|
|
58
58
|
var _defaultValues = {};
|
|
59
59
|
var _nodes = (0, _lodash.transform)(columns, function (result, col) {
|
|
60
60
|
if (col.isShowInForm) {
|
|
61
|
-
var _objectSpread2;
|
|
62
61
|
var customFiled = filedsRewrite.find(function (field) {
|
|
63
62
|
return field.name === col.aliaName;
|
|
64
63
|
}) || {};
|
|
65
|
-
_defaultValues = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, _defaultValues), {}, (
|
|
64
|
+
_defaultValues = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, _defaultValues), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
|
|
66
65
|
result.push((0, _utils.getFormItem)(col, (0, _objectSpread3.default)((0, _objectSpread3.default)({
|
|
67
66
|
formId: ldId,
|
|
68
67
|
moduleCode: moduleCode
|
|
@@ -109,7 +108,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
|
|
|
109
108
|
var values = _ref3.values,
|
|
110
109
|
submitData = _ref3.submitData;
|
|
111
110
|
var _submitData = (0, _utils.dataFormat)(columns, submitData);
|
|
112
|
-
if (_onOperate
|
|
111
|
+
if (_onOperate !== null && _onOperate !== void 0 && _onOperate.post) return _onOperate.post({
|
|
113
112
|
values: values,
|
|
114
113
|
submitData: _submitData
|
|
115
114
|
}); // 以预设为主
|
|
@@ -121,16 +120,15 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
|
|
|
121
120
|
onQuery: (0, _objectSpread3.default)((0, _objectSpread3.default)({
|
|
122
121
|
api: _utils.behaviorCall,
|
|
123
122
|
get: function get(formData) {
|
|
124
|
-
var _params2;
|
|
125
123
|
var _relationKey = isMain ? window.appConfig.constraintKeys.PRIMARY : relationKey;
|
|
126
|
-
var _params = (
|
|
124
|
+
var _params = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][_relationKey] || ticketData[_relationKey]), "moduleCode", moduleCode), "datasetCode", dataSetKey), "behaviorKey", isMain ? 'readForm' : 'readUniqueForm');
|
|
127
125
|
if (!isMain) _params.relationDs = mainDataSetKey;
|
|
128
126
|
return _params;
|
|
129
127
|
}
|
|
130
128
|
}, onQuery), {}, {
|
|
131
129
|
format: function format(data, res) {
|
|
132
130
|
var formItemData = (0, _objectSpread3.default)({}, (0, _utils.formItemDataFormat)(columns, data));
|
|
133
|
-
if (onQuery
|
|
131
|
+
if (onQuery !== null && onQuery !== void 0 && onQuery.format) return onQuery.format(data, formItemData, res); // 以预设为主
|
|
134
132
|
return formItemData;
|
|
135
133
|
}
|
|
136
134
|
})
|
|
@@ -139,5 +137,4 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
|
|
|
139
137
|
onUpdate: onOperate(onUpdate, 'update')
|
|
140
138
|
}, formConfig), basicItems);
|
|
141
139
|
};
|
|
142
|
-
var _default = (0, _ldBuilder.default)(buildLdAutoForm);
|
|
143
|
-
exports.default = _default;
|
|
140
|
+
var _default = exports.default = (0, _ldBuilder.default)(buildLdAutoForm);
|
|
@@ -13,7 +13,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
|
|
|
13
13
|
var _react = _interopRequireWildcard(require("react"));
|
|
14
14
|
var _umi = require("umi");
|
|
15
15
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
16
|
-
var _antd = require("antd");
|
|
16
|
+
var _antd = require("luck-design/antd");
|
|
17
17
|
var _luckDesign = require("luck-design");
|
|
18
18
|
var _lodash = require("lodash");
|
|
19
19
|
var _ahooks = require("ahooks");
|
|
@@ -143,10 +143,10 @@ var LdIndex = function LdIndex(_ref2) {
|
|
|
143
143
|
});
|
|
144
144
|
var Component = (0, _ahooks.useCreation)(function () {
|
|
145
145
|
var _getDvaApp, _getDvaApp2;
|
|
146
|
-
(_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0
|
|
147
|
-
if (!((_getDvaApp2 = (0, _umi.getDvaApp)())
|
|
146
|
+
(_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 || _getDvaApp.unmodel(namespace);
|
|
147
|
+
if (!((_getDvaApp2 = (0, _umi.getDvaApp)()) !== null && _getDvaApp2 !== void 0 && _getDvaApp2._store.getState()[namespace])) {
|
|
148
148
|
var _getDvaApp3;
|
|
149
|
-
(_getDvaApp3 = (0, _umi.getDvaApp)()) === null || _getDvaApp3 === void 0
|
|
149
|
+
(_getDvaApp3 = (0, _umi.getDvaApp)()) === null || _getDvaApp3 === void 0 || _getDvaApp3.model((0, _model.default)(namespace, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
|
150
150
|
isFlow: !!props.isFlow
|
|
151
151
|
}, overModel), {}, {
|
|
152
152
|
dataSetKey: props.dataSetKey,
|
|
@@ -186,7 +186,6 @@ Index.propTypes = {
|
|
|
186
186
|
// 卡片行为
|
|
187
187
|
cardKey: _propTypes.default.string // 卡片主键
|
|
188
188
|
};
|
|
189
|
-
|
|
190
189
|
Index.defaultProps = {
|
|
191
190
|
resultSet: {},
|
|
192
191
|
suppressInit: false,
|
|
@@ -201,9 +200,8 @@ Index.defaultProps = {
|
|
|
201
200
|
overModel: {},
|
|
202
201
|
cardKey: window.appConfig.constraintKeys.PRIMARY
|
|
203
202
|
};
|
|
204
|
-
var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
203
|
+
var _default = exports.default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
205
204
|
return /*#__PURE__*/_react.default.createElement(Index, (0, _extends2.default)({
|
|
206
205
|
wrapperRef: ref
|
|
207
206
|
}, props));
|
|
208
|
-
});
|
|
209
|
-
exports.default = _default;
|
|
207
|
+
});
|
|
@@ -8,15 +8,13 @@ exports.LdTabs = exports.LdIconFont = exports.LdCollapse = exports.LdButtonRadio
|
|
|
8
8
|
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
9
9
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
|
10
10
|
var _react = _interopRequireDefault(require("react"));
|
|
11
|
-
var _antd = require("antd");
|
|
11
|
+
var _antd = require("luck-design/antd");
|
|
12
12
|
var _base = require("@luck-design-biz/base");
|
|
13
13
|
var _ldComBuild = require("../../helper/ldComBuild");
|
|
14
14
|
var _excluded = ["options"];
|
|
15
|
-
var LdButton = (0, _ldComBuild.ldComBuilder)(_antd.Button);
|
|
16
|
-
exports.
|
|
17
|
-
var
|
|
18
|
-
exports.LdCollapse = LdCollapse;
|
|
19
|
-
var LdButtonRadio = function LdButtonRadio(_ref) {
|
|
15
|
+
var LdButton = exports.LdButton = (0, _ldComBuild.ldComBuilder)(_antd.Button);
|
|
16
|
+
var LdCollapse = exports.LdCollapse = (0, _ldComBuild.ldComBuilder)(_base.Collapse);
|
|
17
|
+
var LdButtonRadio = exports.LdButtonRadio = function LdButtonRadio(_ref) {
|
|
20
18
|
var _ref$options = _ref.options,
|
|
21
19
|
options = _ref$options === void 0 ? [] : _ref$options,
|
|
22
20
|
props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
|
|
@@ -24,12 +22,9 @@ var LdButtonRadio = function LdButtonRadio(_ref) {
|
|
|
24
22
|
options: (0, _ldComBuild.filterOptions)(options)
|
|
25
23
|
}));
|
|
26
24
|
};
|
|
27
|
-
exports.
|
|
28
|
-
var
|
|
29
|
-
exports.LdIconFont = LdIconFont;
|
|
30
|
-
var LdTabs = (0, _ldComBuild.deepFilterCom)(_antd.Tabs, function (child) {
|
|
25
|
+
var LdIconFont = exports.LdIconFont = (0, _ldComBuild.ldComBuilder)(_base.IconFont);
|
|
26
|
+
var LdTabs = exports.LdTabs = (0, _ldComBuild.deepFilterCom)(_antd.Tabs, function (child) {
|
|
31
27
|
var _child$type;
|
|
32
|
-
return (child === null || child === void 0
|
|
28
|
+
return (child === null || child === void 0 || (_child$type = child.type) === null || _child$type === void 0 ? void 0 : _child$type.displayName) === 'TabPane';
|
|
33
29
|
});
|
|
34
|
-
exports.LdTabs = LdTabs;
|
|
35
30
|
LdTabs.TabPane = _antd.Tabs.TabPane;
|
|
@@ -94,7 +94,7 @@ var LdFormList = function LdFormList(_ref) {
|
|
|
94
94
|
var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
95
95
|
if (props.formMode !== 'add') {
|
|
96
96
|
var _getDvaApp;
|
|
97
|
-
(_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0
|
|
97
|
+
(_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 || _getDvaApp._store.dispatch({
|
|
98
98
|
type: "".concat(namespace, "/setTicketData"),
|
|
99
99
|
payload: {
|
|
100
100
|
ticketData: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props.ticketData), _params)
|
|
@@ -109,8 +109,8 @@ var LdFormList = function LdFormList(_ref) {
|
|
|
109
109
|
var _ref4 = formListRef.current || {},
|
|
110
110
|
formRefs = _ref4.formRefs;
|
|
111
111
|
var data = formRefs && Object.keys(formRefs).map(function (key) {
|
|
112
|
-
var _formRefs$key, _formRefs$key$
|
|
113
|
-
var getValue = ((
|
|
112
|
+
var _formRefs$key, _formRefs$key$current;
|
|
113
|
+
var getValue = ((_formRefs$key = formRefs[key]) !== null && _formRefs$key !== void 0 && (_formRefs$key = _formRefs$key.formRef) !== null && _formRefs$key !== void 0 && _formRefs$key.current ? formRefs[key].getData : null) || ((_formRefs$key$current = formRefs[key].current) === null || _formRefs$key$current === void 0 ? void 0 : _formRefs$key$current.getFieldsValue);
|
|
114
114
|
return (0, _defineProperty2.default)({}, key, getValue && getValue());
|
|
115
115
|
});
|
|
116
116
|
onValueChange(change, data);
|
|
@@ -332,7 +332,7 @@ var LdFormList = function LdFormList(_ref) {
|
|
|
332
332
|
// 构建带有model的组件
|
|
333
333
|
var builder = function builder(WrappedComponent, namespace, initData) {
|
|
334
334
|
var _getDvaApp2;
|
|
335
|
-
(_getDvaApp2 = (0, _umi.getDvaApp)()) === null || _getDvaApp2 === void 0
|
|
335
|
+
(_getDvaApp2 = (0, _umi.getDvaApp)()) === null || _getDvaApp2 === void 0 || _getDvaApp2._store.dispatch({
|
|
336
336
|
type: "".concat(namespace, "/setFormInit"),
|
|
337
337
|
payload: (0, _objectSpread2.default)({
|
|
338
338
|
formMode: 'add'
|
|
@@ -359,12 +359,12 @@ var Index = function Index(_ref10) {
|
|
|
359
359
|
var match = (0, _umi.useRouteMatch)();
|
|
360
360
|
var Component = (0, _ahooks.useCreation)(function () {
|
|
361
361
|
var _getDvaApp3, _getDvaApp4, _match$params;
|
|
362
|
-
(_getDvaApp3 = (0, _umi.getDvaApp)()) === null || _getDvaApp3 === void 0
|
|
363
|
-
if (!((_getDvaApp4 = (0, _umi.getDvaApp)())
|
|
362
|
+
(_getDvaApp3 = (0, _umi.getDvaApp)()) === null || _getDvaApp3 === void 0 || _getDvaApp3.unmodel(namespace);
|
|
363
|
+
if (!((_getDvaApp4 = (0, _umi.getDvaApp)()) !== null && _getDvaApp4 !== void 0 && _getDvaApp4._store.getState()[namespace])) {
|
|
364
364
|
var _getDvaApp5;
|
|
365
|
-
(_getDvaApp5 = (0, _umi.getDvaApp)()) === null || _getDvaApp5 === void 0
|
|
365
|
+
(_getDvaApp5 = (0, _umi.getDvaApp)()) === null || _getDvaApp5 === void 0 || _getDvaApp5.model((0, _model.default)(namespace, overModel));
|
|
366
366
|
}
|
|
367
|
-
return builder(LdFormList, namespace,
|
|
367
|
+
return builder(LdFormList, namespace, match !== null && match !== void 0 && (_match$params = match.params) !== null && _match$params !== void 0 && _match$params.isEdit ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, initData), {}, {
|
|
368
368
|
formMode: 'edit'
|
|
369
369
|
}) : initData);
|
|
370
370
|
}, [namespace]);
|
|
@@ -395,7 +395,6 @@ Index.propTypes = {
|
|
|
395
395
|
affixLayout: _propTypes.default.oneOf(['top', 'bottom']),
|
|
396
396
|
onValueChange: _propTypes.default.func // 参数变化的事件
|
|
397
397
|
};
|
|
398
|
-
|
|
399
398
|
Index.defaultProps = {
|
|
400
399
|
initData: {},
|
|
401
400
|
readOnly: false,
|
|
@@ -410,9 +409,8 @@ Index.defaultProps = {
|
|
|
410
409
|
},
|
|
411
410
|
overModel: {}
|
|
412
411
|
};
|
|
413
|
-
var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
412
|
+
var _default = exports.default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
414
413
|
return /*#__PURE__*/_react.default.createElement(Index, (0, _extends2.default)({
|
|
415
414
|
wrapperRef: ref
|
|
416
415
|
}, props));
|
|
417
|
-
});
|
|
418
|
-
exports.default = _default;
|
|
416
|
+
});
|
|
@@ -101,7 +101,7 @@ var LdGrid = function LdGrid(_ref) {
|
|
|
101
101
|
var mergeFields = (0, _lodash.union)((0, _lodash.keys)(defaultColumns), (0, _lodash.keys)(customColumns));
|
|
102
102
|
return (0, _lodash.transform)(mergeFields, function (result, field) {
|
|
103
103
|
var _customColumns$field;
|
|
104
|
-
if ((_customColumns$field = customColumns[field])
|
|
104
|
+
if ((_customColumns$field = customColumns[field]) !== null && _customColumns$field !== void 0 && _customColumns$field.hide) {
|
|
105
105
|
// 任何情况都不显示
|
|
106
106
|
} else if (!defaultColumns[field]) {
|
|
107
107
|
// 数据集中不存在的字段以自定义的形式展示
|
|
@@ -175,10 +175,10 @@ var LdIndex = function LdIndex(_ref2) {
|
|
|
175
175
|
var isTreeGrid = (0, _lodash.isNil)(_isTreeGrid) ? (0, _lodash.includes)(props.isTree, props.dataSetKey) : _isTreeGrid;
|
|
176
176
|
var Component = (0, _ahooks.useCreation)(function () {
|
|
177
177
|
var _getDvaApp, _getDvaApp2;
|
|
178
|
-
(_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0
|
|
179
|
-
if (!((_getDvaApp2 = (0, _umi.getDvaApp)())
|
|
178
|
+
(_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 || _getDvaApp.unmodel(namespace);
|
|
179
|
+
if (!((_getDvaApp2 = (0, _umi.getDvaApp)()) !== null && _getDvaApp2 !== void 0 && _getDvaApp2._store.getState()[namespace])) {
|
|
180
180
|
var _getDvaApp3;
|
|
181
|
-
(_getDvaApp3 = (0, _umi.getDvaApp)()) === null || _getDvaApp3 === void 0
|
|
181
|
+
(_getDvaApp3 = (0, _umi.getDvaApp)()) === null || _getDvaApp3 === void 0 || _getDvaApp3.model((0, _model.default)(namespace, (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
|
182
182
|
isFlow: isTreeGrid || !!props.isFlow
|
|
183
183
|
}, overModel), {}, {
|
|
184
184
|
dataSetKey: props.dataSetKey,
|
|
@@ -223,7 +223,6 @@ Index.propTypes = {
|
|
|
223
223
|
// 初始化后
|
|
224
224
|
rowKey: _propTypes.default.string // 初始化后
|
|
225
225
|
};
|
|
226
|
-
|
|
227
226
|
Index.defaultProps = {
|
|
228
227
|
columnsRewrite: [],
|
|
229
228
|
columnsReset: null,
|
|
@@ -239,9 +238,8 @@ Index.defaultProps = {
|
|
|
239
238
|
overModel: {},
|
|
240
239
|
rowKey: window.appConfig.constraintKeys.PRIMARY
|
|
241
240
|
};
|
|
242
|
-
var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
241
|
+
var _default = exports.default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
243
242
|
return /*#__PURE__*/_react.default.createElement(Index, (0, _extends2.default)({
|
|
244
243
|
wrapperRef: ref
|
|
245
244
|
}, props));
|
|
246
|
-
});
|
|
247
|
-
exports.default = _default;
|
|
245
|
+
});
|
|
@@ -73,7 +73,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
|
|
|
73
73
|
var _defaultValues = {};
|
|
74
74
|
var _nodes = (0, _lodash.transform)(gridColumns, function (result, col) {
|
|
75
75
|
if (col.isShowInForm) {
|
|
76
|
-
var
|
|
76
|
+
var _customColumn;
|
|
77
77
|
var customColumn = columnsRewrite.find(function (column) {
|
|
78
78
|
return column.field === col.aliaName;
|
|
79
79
|
}) || {};
|
|
@@ -81,7 +81,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
|
|
|
81
81
|
editable: false,
|
|
82
82
|
mode: 'grid'
|
|
83
83
|
});
|
|
84
|
-
_defaultValues = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, _defaultValues), {}, (
|
|
84
|
+
_defaultValues = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, _defaultValues), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
|
|
85
85
|
result.push((0, _utils.getFormColumn)(type, col, (0, _objectSpread4.default)((0, _objectSpread4.default)({}, customColumn), {}, {
|
|
86
86
|
formItemRewrite: (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
|
|
87
87
|
moduleCode: moduleCode,
|
|
@@ -133,7 +133,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
|
|
|
133
133
|
var _submitData = data.map(function (item) {
|
|
134
134
|
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);
|
|
135
135
|
});
|
|
136
|
-
if (_onOperate
|
|
136
|
+
if (_onOperate !== null && _onOperate !== void 0 && _onOperate.post) return _onOperate.post(_submitData); // 以预设为主
|
|
137
137
|
return (0, _defineProperty2.default)({}, dataSetKey, (0, _defineProperty2.default)({}, "".concat(behaviorKey, "List"), _submitData));
|
|
138
138
|
}
|
|
139
139
|
});
|
|
@@ -162,7 +162,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
|
|
|
162
162
|
var formItemData = data.map(function (item) {
|
|
163
163
|
return (0, _utils.formItemDataFormat)(gridColumns, item);
|
|
164
164
|
});
|
|
165
|
-
if (onQuery
|
|
165
|
+
if (onQuery !== null && onQuery !== void 0 && onQuery.format) return onQuery.format(data, formItemData); // 以预设为主
|
|
166
166
|
return formItemData;
|
|
167
167
|
}
|
|
168
168
|
}),
|
|
@@ -175,7 +175,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
|
|
|
175
175
|
indocno: item[window.appConfig.constraintKeys.PRIMARY]
|
|
176
176
|
};
|
|
177
177
|
});
|
|
178
|
-
if (onDelete
|
|
178
|
+
if (onDelete !== null && onDelete !== void 0 && onDelete.post) return onDelete.post(_submitData); // 以预设为主
|
|
179
179
|
return (0, _defineProperty2.default)({}, dataSetKey, {
|
|
180
180
|
deleteList: _submitData
|
|
181
181
|
});
|
|
@@ -189,5 +189,4 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
|
|
|
189
189
|
className: (0, _classnames.default)(_index.default.ldGridForm, (0, _defineProperty2.default)({}, className, !!className))
|
|
190
190
|
}));
|
|
191
191
|
};
|
|
192
|
-
var _default = (0, _ldBuilder.default)(buildLdGridForm);
|
|
193
|
-
exports.default = _default;
|
|
192
|
+
var _default = exports.default = (0, _ldBuilder.default)(buildLdGridForm);
|
|
@@ -119,9 +119,8 @@ Index.defaultProps = {
|
|
|
119
119
|
customColumns: null,
|
|
120
120
|
defaultParmas: {}
|
|
121
121
|
};
|
|
122
|
-
var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
122
|
+
var _default = exports.default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
123
123
|
return /*#__PURE__*/_react.default.createElement(Index, (0, _extends2.default)({
|
|
124
124
|
wrapperRef: ref
|
|
125
125
|
}, props));
|
|
126
|
-
});
|
|
127
|
-
exports.default = _default;
|
|
126
|
+
});
|
|
@@ -13,8 +13,7 @@ var _lodash = require("lodash");
|
|
|
13
13
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
14
14
|
var _base = require("@luck-design-biz/base");
|
|
15
15
|
var _excluded = ["component", "size"];
|
|
16
|
-
var LuckDaPopContext = /*#__PURE__*/(0, _react.createContext)();
|
|
17
|
-
exports.LuckDaPopContext = LuckDaPopContext;
|
|
16
|
+
var LuckDaPopContext = exports.LuckDaPopContext = /*#__PURE__*/(0, _react.createContext)();
|
|
18
17
|
var LdPop = function LdPop() {
|
|
19
18
|
var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
|
|
20
19
|
ldId = _ref.ldId,
|
|
@@ -36,5 +35,4 @@ var LdPop = function LdPop() {
|
|
|
36
35
|
LdPop.propTypes = {
|
|
37
36
|
ldId: _propTypes.default.string.isRequired
|
|
38
37
|
};
|
|
39
|
-
var _default = LdPop;
|
|
40
|
-
exports.default = _default;
|
|
38
|
+
var _default = exports.default = LdPop;
|