@luck-design-biz/luckda 1.0.2-9 → 1.0.3-13tl
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/LDActions/index.js +1 -0
- package/es/components/LdFormList/index.js +6 -4
- package/es/components/LdGrid/index.js +1 -4
- package/es/helper/action.js +2 -0
- package/es/locales/zh-CN.js +18 -1
- package/es/lowcode/constants/api-url.js +329 -187
- package/es/lowcode/engine/meta/box.props.default.json +1 -1
- package/es/lowcode/engine/meta/box.props.json +1 -1
- package/es/lowcode/engine/meta/button.api.json +0 -0
- package/es/lowcode/engine/meta/dialog.props.default.json +4 -1
- package/es/lowcode/engine/meta/dialog.props.json +24 -4
- package/es/lowcode/engine/meta/drawer.props.json +1 -1
- package/es/lowcode/engine/meta/form.props.json +1 -1
- package/es/lowcode/engine/provider/ContextProvider/router.js +21 -1
- package/es/lowcode/painter/DesignOperator.js +4 -3
- package/es/lowcode/painter/History.js +300 -0
- package/es/lowcode/painter/Ribbon.js +37 -1
- package/es/lowcode/painter/components/AdvancePanel.js +1 -1
- package/es/lowcode/painter/components/code-editor/DiffEditor.js +41 -0
- package/es/lowcode/painter/components/field-setting/FieldAttrs.js +2 -2
- package/es/lowcode/painter/components/field-setting/SettingUI.js +0 -1
- package/es/lowcode/painter/panel-section/ConditionCheck.js +71 -0
- package/es/lowcode/painter/panel-section/DialogSize.js +76 -0
- package/es/lowcode/painter/panel-section/DialogWidthHeight.js +60 -0
- package/es/lowcode/painter/panel-section/JSEditor/ToolBar.js +61 -6
- package/es/lowcode/painter/panel-section/JSEditor/index.js +37 -5
- package/es/lowcode/painter/panel-section/PageLayoutDisplay.js +7 -2
- package/es/lowcode/painter/style/action-bind-modal.less +1 -1
- package/es/lowcode/painter/style/history.less +46 -0
- package/es/lowcode/painter/style/outline.less +1 -1
- package/es/lowcode/view/lc-components/Box/meta.json +1 -1
- package/es/lowcode/view/lc-components/Dialog/index.js +12 -5
- package/es/lowcode/view/lc-components/Dialog/meta.json +24 -4
- package/es/lowcode/view/lc-components/Drawer/index.js +3 -3
- package/es/lowcode/view/lc-components/Drawer/meta.json +1 -1
- package/es/lowcode/view/lc-components/Form/index.js +12 -19
- package/es/lowcode/view/lc-components/Form/meta.json +1 -1
- package/es/lowcode/view/lc-components/PageLayout/index.js +1 -1
- package/es/lowcode/view/lc-components/Table/components/TopImex.js +33 -16
- package/es/lowcode/view/lc-components/Table/index.js +5 -4
- package/es/upload/FilesWall/index.js +16 -6
- package/es/upload/Form/gridForm.js +16 -6
- package/es/upload/FormItem/index.js +16 -4
- package/es/utils/form.js +4 -3
- package/es/utils/grid.js +10 -2
- package/lib/components/LDActions/index.js +1 -0
- package/lib/components/LdFormList/index.js +6 -4
- package/lib/components/LdGrid/index.js +1 -4
- package/lib/helper/action.js +2 -0
- package/lib/locales/zh-CN.js +18 -1
- package/lib/lowcode/constants/api-url.js +329 -188
- package/lib/lowcode/engine/meta/box.props.default.json +1 -1
- package/lib/lowcode/engine/meta/box.props.json +1 -1
- package/lib/lowcode/engine/meta/button.api.json +0 -0
- package/lib/lowcode/engine/meta/dialog.props.default.json +4 -1
- package/lib/lowcode/engine/meta/dialog.props.json +24 -4
- package/lib/lowcode/engine/meta/drawer.props.json +1 -1
- package/lib/lowcode/engine/meta/form.props.json +1 -1
- package/lib/lowcode/engine/provider/ContextProvider/router.js +22 -1
- package/lib/lowcode/painter/DesignOperator.js +4 -3
- package/lib/lowcode/painter/History.js +308 -0
- package/lib/lowcode/painter/Ribbon.js +37 -1
- package/lib/lowcode/painter/components/AdvancePanel.js +1 -1
- package/lib/lowcode/painter/components/code-editor/DiffEditor.js +49 -0
- package/lib/lowcode/painter/components/field-setting/FieldAttrs.js +2 -2
- package/lib/lowcode/painter/components/field-setting/SettingUI.js +0 -1
- package/lib/lowcode/painter/panel-section/ConditionCheck.js +79 -0
- package/lib/lowcode/painter/panel-section/DialogSize.js +83 -0
- package/lib/lowcode/painter/panel-section/DialogWidthHeight.js +67 -0
- package/lib/lowcode/painter/panel-section/JSEditor/ToolBar.js +61 -6
- package/lib/lowcode/painter/panel-section/JSEditor/index.js +36 -4
- package/lib/lowcode/painter/panel-section/PageLayoutDisplay.js +7 -2
- package/lib/lowcode/painter/style/action-bind-modal.less +1 -1
- package/lib/lowcode/painter/style/history.less +46 -0
- package/lib/lowcode/painter/style/outline.less +1 -1
- package/lib/lowcode/view/lc-components/Box/meta.json +1 -1
- package/lib/lowcode/view/lc-components/Dialog/index.js +10 -3
- package/lib/lowcode/view/lc-components/Dialog/meta.json +24 -4
- package/lib/lowcode/view/lc-components/Drawer/index.js +1 -1
- package/lib/lowcode/view/lc-components/Drawer/meta.json +1 -1
- package/lib/lowcode/view/lc-components/Form/index.js +12 -19
- package/lib/lowcode/view/lc-components/Form/meta.json +1 -1
- package/lib/lowcode/view/lc-components/PageLayout/index.js +1 -1
- package/lib/lowcode/view/lc-components/Table/components/TopImex.js +32 -15
- package/lib/lowcode/view/lc-components/Table/index.js +5 -4
- package/lib/upload/FilesWall/index.js +13 -3
- package/lib/upload/Form/gridForm.js +13 -3
- package/lib/upload/FormItem/index.js +15 -3
- package/lib/utils/form.js +3 -2
- package/lib/utils/grid.js +11 -3
- package/package.json +1 -2
- package/es/lowcode/engine/meta/fielddatadic.props.default.json +0 -16
- package/es/lowcode/engine/meta/fielddatadic.props.json +0 -73
- package/lib/lowcode/engine/meta/fielddatadic.props.default.json +0 -16
- package/lib/lowcode/engine/meta/fielddatadic.props.json +0 -73
|
@@ -511,34 +511,27 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
|
|
|
511
511
|
});
|
|
512
512
|
var beforeSubmit = (0, _ahooks.useMemoizedFn)(function (values, data) {
|
|
513
513
|
return new Promise( /*#__PURE__*/function () {
|
|
514
|
-
var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(resolve) {
|
|
515
|
-
var _data;
|
|
514
|
+
var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(resolve, reject) {
|
|
516
515
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
|
|
517
516
|
while (1) switch (_context.prev = _context.next) {
|
|
518
517
|
case 0:
|
|
519
|
-
if (
|
|
520
|
-
|
|
521
|
-
|
|
518
|
+
if ((0, _lodash.isNil)(advance.events.beforeSave)) resolve(values);else {
|
|
519
|
+
ctx.doAction(advance.events.beforeSave, {
|
|
520
|
+
values: values,
|
|
521
|
+
data: data
|
|
522
|
+
}).then(function (_data) {
|
|
523
|
+
resolve((0, _lodash.last)(_data));
|
|
524
|
+
}).catch(function () {
|
|
525
|
+
reject();
|
|
526
|
+
});
|
|
522
527
|
}
|
|
523
|
-
|
|
524
|
-
_context.next = 8;
|
|
525
|
-
break;
|
|
526
|
-
case 4:
|
|
527
|
-
_context.next = 6;
|
|
528
|
-
return ctx.doAction(advance.events.beforeSave, {
|
|
529
|
-
values: values,
|
|
530
|
-
data: data
|
|
531
|
-
});
|
|
532
|
-
case 6:
|
|
533
|
-
_data = _context.sent;
|
|
534
|
-
resolve((0, _lodash.last)(_data));
|
|
535
|
-
case 8:
|
|
528
|
+
case 1:
|
|
536
529
|
case "end":
|
|
537
530
|
return _context.stop();
|
|
538
531
|
}
|
|
539
532
|
}, _callee);
|
|
540
533
|
}));
|
|
541
|
-
return function (_x) {
|
|
534
|
+
return function (_x, _x2) {
|
|
542
535
|
return _ref9.apply(this, arguments);
|
|
543
536
|
};
|
|
544
537
|
}());
|
|
@@ -598,7 +598,7 @@
|
|
|
598
598
|
"key": "beforeSave",
|
|
599
599
|
"name": "保存前置事件",
|
|
600
600
|
"desc": "保存前置事件,promise,返回false取消执行",
|
|
601
|
-
"func": "function beforeSave(values, data) {\n return values; \n}"
|
|
601
|
+
"func": "function beforeSave(values, data) {\n return new Promise(resolve=>resolve(values)); \n}"
|
|
602
602
|
},
|
|
603
603
|
{
|
|
604
604
|
"key": "onSaveCallback",
|
|
@@ -39,7 +39,7 @@ var LCPageLayout = function LCPageLayout(_ref) {
|
|
|
39
39
|
$css: css,
|
|
40
40
|
height: height,
|
|
41
41
|
width: width
|
|
42
|
-
}, display === 'tb' ? /*#__PURE__*/_react.default.createElement(_base.Layout.Main, null, (children === null || children === void 0 ? void 0 : children.length) === display.split('').length ? /*#__PURE__*/_react.default.createElement(_base.MemorySplit, {
|
|
42
|
+
}, display === 'tb' || display === 's' ? /*#__PURE__*/_react.default.createElement(_base.Layout.Main, null, (children === null || children === void 0 ? void 0 : children.length) === display.split('').length ? /*#__PURE__*/_react.default.createElement(_base.MemorySplit, {
|
|
43
43
|
split: "horizontal"
|
|
44
44
|
}, children) : null) : [/*#__PURE__*/_react.default.createElement(_base.Layout.Sider, null, children === null || children === void 0 ? void 0 : children[0]), /*#__PURE__*/_react.default.createElement(_base.Layout.Main, null, (children === null || children === void 0 ? void 0 : children.length) === display.split('').length ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, display === 'lr' ? children === null || children === void 0 ? void 0 : children[1] : /*#__PURE__*/_react.default.createElement(_base.MemorySplit, {
|
|
45
45
|
split: display === 'ltb' ? 'horizontal' : 'vertical'
|
|
@@ -15,6 +15,7 @@ var _antd = require("luck-design/antd");
|
|
|
15
15
|
var _ApiConfig = _interopRequireDefault(require("@/services/ApiConfig"));
|
|
16
16
|
var _luckDesign = require("luck-design");
|
|
17
17
|
var _apiUrl = require("../../../../constants/api-url");
|
|
18
|
+
var _helper = require("../../../../engine/tools/helper");
|
|
18
19
|
var _styledComponents = _interopRequireDefault(require("styled-components"));
|
|
19
20
|
var _lodash = require("lodash");
|
|
20
21
|
var _ahooks = require("ahooks");
|
|
@@ -27,6 +28,7 @@ var UploadDoneWrap = _styledComponents.default.div.withConfig({
|
|
|
27
28
|
displayName: "UploadDoneWrap",
|
|
28
29
|
componentId: "luckda-6530__sc-1eag873-1"
|
|
29
30
|
})(["display:flex;align-items:center;justify-content:center;flex-direction:column;padding:16px;"]);
|
|
31
|
+
var mdCode = (0, _helper.getLDMetaAttr)('dataModelKey');
|
|
30
32
|
|
|
31
33
|
// options: {import: 'templateId' | 'behaviorKey', importType: false | true, moduleCode}
|
|
32
34
|
var ImportUploadPop = exports.ImportUploadPop = function ImportUploadPop(_ref) {
|
|
@@ -51,6 +53,11 @@ var ImportUploadPop = exports.ImportUploadPop = function ImportUploadPop(_ref) {
|
|
|
51
53
|
manual: true
|
|
52
54
|
}),
|
|
53
55
|
runAsyncImport = _useRequest.runAsync;
|
|
56
|
+
|
|
57
|
+
// 清除进度
|
|
58
|
+
var clearProgress = function clearProgress(batchNo) {
|
|
59
|
+
(0, _apiUrl.clearProcess)(batchNo).then();
|
|
60
|
+
};
|
|
54
61
|
var fecthFindExcelState = function fecthFindExcelState(_ref2, callback) {
|
|
55
62
|
var strategy = _ref2.strategy,
|
|
56
63
|
batchNo = _ref2.batchNo,
|
|
@@ -62,7 +69,7 @@ var ImportUploadPop = exports.ImportUploadPop = function ImportUploadPop(_ref) {
|
|
|
62
69
|
moduleCode: moduleCode,
|
|
63
70
|
behaviorKey: behaviorKey,
|
|
64
71
|
templateId: templateId,
|
|
65
|
-
reportType:
|
|
72
|
+
reportType: 'import'
|
|
66
73
|
};
|
|
67
74
|
(0, _apiUrl.getFindexcelstate)(_fetchExcelStatePrefix, _fetchExcelStateParams).then(function (response) {
|
|
68
75
|
if (response.code === 1) {
|
|
@@ -80,13 +87,16 @@ var ImportUploadPop = exports.ImportUploadPop = function ImportUploadPop(_ref) {
|
|
|
80
87
|
}, 500);
|
|
81
88
|
} else {
|
|
82
89
|
setActionStep('finish');
|
|
90
|
+
clearProgress(batchNo);
|
|
83
91
|
}
|
|
84
92
|
} else {
|
|
85
93
|
callback();
|
|
86
94
|
setActionStep('finish');
|
|
95
|
+
clearProgress(batchNo);
|
|
87
96
|
}
|
|
88
97
|
}).catch(function () {
|
|
89
98
|
setActionStep('finish');
|
|
99
|
+
clearProgress(batchNo);
|
|
90
100
|
callback();
|
|
91
101
|
});
|
|
92
102
|
};
|
|
@@ -155,7 +165,7 @@ var ImportUploadPop = exports.ImportUploadPop = function ImportUploadPop(_ref) {
|
|
|
155
165
|
};
|
|
156
166
|
}();
|
|
157
167
|
return /*#__PURE__*/_react.default.createElement(_luckDesign.PopWindow, {
|
|
158
|
-
title:
|
|
168
|
+
title: '上传excel文件',
|
|
159
169
|
mode: "modal",
|
|
160
170
|
size: "mini",
|
|
161
171
|
visible: visible,
|
|
@@ -192,11 +202,14 @@ var ImportUploadPop = exports.ImportUploadPop = function ImportUploadPop(_ref) {
|
|
|
192
202
|
accept: '.xls,.xlsx,.xlt,.xlsm',
|
|
193
203
|
name: 'fileObj',
|
|
194
204
|
beforeUpload: function beforeUpload(file) {
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
205
|
+
return new Promise(function (resolve, reject) {
|
|
206
|
+
var suffix = (0, _lodash.lowerCase)((0, _lodash.last)((0, _lodash.split)(file.name, '.')));
|
|
207
|
+
if (!(0, _lodash.includes)(['xls', 'xlsx', 'xlt', 'xlsm'], suffix)) {
|
|
208
|
+
reject(new Error('禁止上传的文件类型'));
|
|
209
|
+
} else {
|
|
210
|
+
resolve(true);
|
|
211
|
+
}
|
|
212
|
+
});
|
|
200
213
|
}
|
|
201
214
|
}
|
|
202
215
|
})), templateUrl && /*#__PURE__*/_react.default.createElement(DownloadLink, null, /*#__PURE__*/_react.default.createElement("a", {
|
|
@@ -206,8 +219,12 @@ var ImportUploadPop = exports.ImportUploadPop = function ImportUploadPop(_ref) {
|
|
|
206
219
|
type: "link"
|
|
207
220
|
}, /*#__PURE__*/_react.default.createElement(_antd.Icon, {
|
|
208
221
|
type: "download"
|
|
209
|
-
}), " \u4E0B\u8F7D\u6A21\u7248")))) : /*#__PURE__*/_react.default.createElement(UploadDoneWrap, null, /*#__PURE__*/_react.default.createElement("p", null, "\u5DF2\u5BFC\u5165\uFF1A", uploadResult.totalCount || 0, "\u6761\uFF0C\u6210\u529F\uFF1A", uploadResult.successCount || 0, "\u6761\uFF0C\u5931\u8D25\uFF1A", uploadResult.failureCount, "\u6761"), uploadResult.failureCount > 0 ?
|
|
210
|
-
|
|
222
|
+
}), " \u4E0B\u8F7D\u6A21\u7248")))) : /*#__PURE__*/_react.default.createElement(UploadDoneWrap, null, /*#__PURE__*/_react.default.createElement("p", null, "\u5DF2\u5BFC\u5165\uFF1A", uploadResult.totalCount || 0, "\u6761\uFF0C\u6210\u529F\uFF1A", uploadResult.successCount || 0, "\u6761\uFF0C\u5931\u8D25\uFF1A", uploadResult.failureCount, "\u6761"), uploadResult.failureCount > 0 ?
|
|
223
|
+
/*#__PURE__*/
|
|
224
|
+
//1. http://ip/api/fes
|
|
225
|
+
//2. 循环结束调用clearProgress (batchNo)
|
|
226
|
+
_react.default.createElement("a", {
|
|
227
|
+
href: "".concat(window.location.origin).concat(_ApiConfig.default.API_HOST, "/").concat(mdCode).concat(uploadResult.errorFileUrl),
|
|
211
228
|
download: true
|
|
212
229
|
}, "\u4E0B\u8F7D\u51FA\u9519\u8868\u683C\u4FE1\u606F") : ''));
|
|
213
230
|
};
|
|
@@ -256,7 +273,7 @@ var TopExport = exports.TopExport = function TopExport(_ref5) {
|
|
|
256
273
|
var _fetchExcelStateParams = {
|
|
257
274
|
moduleCode: moduleCode,
|
|
258
275
|
behaviorKey: behaviorKey,
|
|
259
|
-
reportType:
|
|
276
|
+
reportType: 'export'
|
|
260
277
|
};
|
|
261
278
|
(0, _apiUrl.getFindexcelstate)(_fetchExcelStatePrefix, _fetchExcelStateParams).then(function (response) {
|
|
262
279
|
if (response.code === 1) {
|
|
@@ -307,7 +324,7 @@ var TopExport = exports.TopExport = function TopExport(_ref5) {
|
|
|
307
324
|
_exportExcelParams = {
|
|
308
325
|
moduleCode: moduleCode,
|
|
309
326
|
behaviorKey: behaviorKey,
|
|
310
|
-
reportType:
|
|
327
|
+
reportType: 'export'
|
|
311
328
|
};
|
|
312
329
|
_exportExcelPrefix = "/".concat(strategy);
|
|
313
330
|
_context2.next = 10;
|
|
@@ -338,14 +355,14 @@ var TopExport = exports.TopExport = function TopExport(_ref5) {
|
|
|
338
355
|
labels.push(column.colDef.headerName);
|
|
339
356
|
fieldInfo.push({
|
|
340
357
|
width: column.actualWidth,
|
|
341
|
-
fieldNm: column.colId
|
|
358
|
+
fieldNm: column.colDef.exportField || column.colId
|
|
342
359
|
});
|
|
343
360
|
}
|
|
344
361
|
});
|
|
345
362
|
defaultExcelParams = {
|
|
346
|
-
bgColor:
|
|
363
|
+
bgColor: '#69b1ff',
|
|
347
364
|
dataUrl: "".concat(window.location.origin, "/api").concat(apiUrl).concat(joiner, "token=").concat(window.cookie.get(window.appConfig.authSaveKey)),
|
|
348
|
-
excelName:
|
|
365
|
+
excelName: 'download.xls',
|
|
349
366
|
fieldInfo: fieldInfo,
|
|
350
367
|
islock: false,
|
|
351
368
|
labels: labels === null || labels === void 0 ? void 0 : labels.join(),
|
|
@@ -353,7 +370,7 @@ var TopExport = exports.TopExport = function TopExport(_ref5) {
|
|
|
353
370
|
};
|
|
354
371
|
_exportExcelParams2 = (0, _objectSpread2.default)({
|
|
355
372
|
moduleCode: moduleCode,
|
|
356
|
-
reportType:
|
|
373
|
+
reportType: 'export'
|
|
357
374
|
}, defaultExcelParams);
|
|
358
375
|
_exportExcelPrefix2 = "/".concat(strategy);
|
|
359
376
|
_context2.next = 23;
|
|
@@ -283,7 +283,7 @@ var LCTable = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
|
|
|
283
283
|
labels.push(column.colDef.headerName);
|
|
284
284
|
fieldInfo.push({
|
|
285
285
|
width: column.actualWidth,
|
|
286
|
-
fieldNm: column.colId
|
|
286
|
+
fieldNm: column.colDef.exportField || column.colId
|
|
287
287
|
});
|
|
288
288
|
}
|
|
289
289
|
});
|
|
@@ -455,7 +455,7 @@ var LCTable = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
|
|
|
455
455
|
}));
|
|
456
456
|
}
|
|
457
457
|
return resultComp;
|
|
458
|
-
}, [topActionGroup, impexp]);
|
|
458
|
+
}, [topActionGroup, impexp, moduleCode]);
|
|
459
459
|
var renderFilterArea = (0, _react.useCallback)(function () {
|
|
460
460
|
return topFilter ? /*#__PURE__*/_react.default.createElement(_TopFilter.default, {
|
|
461
461
|
filter: topFilter,
|
|
@@ -574,8 +574,9 @@ var LCTable = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
|
|
|
574
574
|
wrapper: wrapperRef,
|
|
575
575
|
wrapperProps: _wrapperProps,
|
|
576
576
|
width: width,
|
|
577
|
-
height: height
|
|
578
|
-
_loading
|
|
577
|
+
height: height
|
|
578
|
+
// _loading={ctx.loading}
|
|
579
|
+
,
|
|
579
580
|
bordered: bordered,
|
|
580
581
|
className: (0, _classnames.default)((0, _defineProperty2.default)({}, className, !!className)),
|
|
581
582
|
ldId: id,
|
|
@@ -157,12 +157,22 @@ var FilesWall = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
157
157
|
});
|
|
158
158
|
onUploadChange && onUploadChange(e);
|
|
159
159
|
};
|
|
160
|
+
var headers = {};
|
|
161
|
+
var token = window.cookie.get(window.appConfig.authSaveKey);
|
|
162
|
+
if (token) headers.Authorization = "Bearer ".concat(token);
|
|
163
|
+
var ticket = _umi.history.location.query.ticket;
|
|
164
|
+
if (ticket) headers.ticket = (0, _utils.string2ASCII)(ticket);
|
|
165
|
+
if (window.__POWERED_BY_QIANKUN__) {
|
|
166
|
+
var pathname = (0, _lodash.replace)(window.location.pathname, (0, _umi.getCreateHistoryOptions)().basename, '');
|
|
167
|
+
headers['Mf-Path'] = pathname.length > 0 ? pathname : '/';
|
|
168
|
+
headers['Sys-Code'] = (0, _umi.getCreateHistoryOptions)().basename.split('/')[1];
|
|
169
|
+
if (window.routeCode) headers['Menu-Code'] = window.routeCode;
|
|
170
|
+
}
|
|
171
|
+
;
|
|
160
172
|
var formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
|
|
161
173
|
action: getUrl('upload'),
|
|
162
174
|
// 上传地址
|
|
163
|
-
headers:
|
|
164
|
-
Authorization: "Bearer ".concat(window.cookie.get(window.appConfig.authSaveKey))
|
|
165
|
-
},
|
|
175
|
+
headers: headers,
|
|
166
176
|
// 请求头
|
|
167
177
|
name: 'files',
|
|
168
178
|
multiple: true,
|
|
@@ -206,12 +206,22 @@ var UploadGridForm = function UploadGridForm(_ref) {
|
|
|
206
206
|
}
|
|
207
207
|
});
|
|
208
208
|
var renderUploadTopLeft = (0, _ahooks.useMemoizedFn)(function () {
|
|
209
|
+
var headers = {};
|
|
210
|
+
var token = window.cookie.get(window.appConfig.authSaveKey);
|
|
211
|
+
if (token) headers.Authorization = "Bearer ".concat(token);
|
|
212
|
+
var ticket = _umi.history.location.query.ticket;
|
|
213
|
+
if (ticket) headers.ticket = (0, _utils.string2ASCII)(ticket);
|
|
214
|
+
if (window.__POWERED_BY_QIANKUN__) {
|
|
215
|
+
var pathname = (0, _lodash.replace)(window.location.pathname, (0, _umi.getCreateHistoryOptions)().basename, '');
|
|
216
|
+
headers['Mf-Path'] = pathname.length > 0 ? pathname : '/';
|
|
217
|
+
headers['Sys-Code'] = (0, _umi.getCreateHistoryOptions)().basename.split('/')[1];
|
|
218
|
+
if (window.routeCode) headers['Menu-Code'] = window.routeCode;
|
|
219
|
+
}
|
|
220
|
+
;
|
|
209
221
|
var formItemProps = {
|
|
210
222
|
action: uploadUrl || getUrl('upload'),
|
|
211
223
|
// 上传地址
|
|
212
|
-
headers:
|
|
213
|
-
Authorization: "Bearer ".concat(window.cookie.get(window.appConfig.authSaveKey))
|
|
214
|
-
},
|
|
224
|
+
headers: headers,
|
|
215
225
|
// 请求头
|
|
216
226
|
name: 'files',
|
|
217
227
|
multiple: true,
|
|
@@ -9,7 +9,9 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
|
|
|
9
9
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
|
10
10
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
|
11
11
|
var _react = _interopRequireDefault(require("react"));
|
|
12
|
+
var _lodash = require("lodash");
|
|
12
13
|
var _luckDesign = require("luck-design");
|
|
14
|
+
var _umi = require("umi");
|
|
13
15
|
var _utils = require("@luck-design-biz/base/utils");
|
|
14
16
|
var _excluded = ["uploadUrl", "moduleCode", "bucket", "tag", "note", "config", "supportTypes", "forbiddenTypes", "children", "dataFormat", "listType"];
|
|
15
17
|
/**
|
|
@@ -51,6 +53,18 @@ function buildComponent(props) {
|
|
|
51
53
|
return "".concat(window.appConfig.OSS_HOST_V3, "?moduleCode=").concat(moduleCode, "&behaviorKey=").concat(behaviorKey, "&bucket=").concat(bucket, "&tag=").concat(tag, "¬e=").concat(note);
|
|
52
54
|
};
|
|
53
55
|
var supportUploadTypes = (0, _utils.getSupportUploadTypes)(forbiddenTypes, supportTypes);
|
|
56
|
+
var headers = {};
|
|
57
|
+
var token = window.cookie.get(window.appConfig.authSaveKey);
|
|
58
|
+
if (token) headers.Authorization = "Bearer ".concat(token);
|
|
59
|
+
var ticket = _umi.history.location.query.ticket;
|
|
60
|
+
if (ticket) headers.ticket = (0, _utils.string2ASCII)(ticket);
|
|
61
|
+
if (window.__POWERED_BY_QIANKUN__) {
|
|
62
|
+
var pathname = (0, _lodash.replace)(window.location.pathname, (0, _umi.getCreateHistoryOptions)().basename, '');
|
|
63
|
+
headers['Mf-Path'] = pathname.length > 0 ? pathname : '/';
|
|
64
|
+
headers['Sys-Code'] = (0, _umi.getCreateHistoryOptions)().basename.split('/')[1];
|
|
65
|
+
if (window.routeCode) headers['Menu-Code'] = window.routeCode;
|
|
66
|
+
}
|
|
67
|
+
;
|
|
54
68
|
return /*#__PURE__*/_react.default.createElement(_luckDesign.BasicFormItem, (0, _extends2.default)({
|
|
55
69
|
extra: "".concat((0, _utils.formatMessage)({
|
|
56
70
|
id: 'app.upload.supportUpload',
|
|
@@ -68,9 +82,7 @@ function buildComponent(props) {
|
|
|
68
82
|
}),
|
|
69
83
|
action: uploadUrl || getUrl('upload'),
|
|
70
84
|
// 上传地址
|
|
71
|
-
headers:
|
|
72
|
-
Authorization: "Bearer ".concat(window.cookie.get(window.appConfig.authSaveKey))
|
|
73
|
-
},
|
|
85
|
+
headers: headers,
|
|
74
86
|
// 请求头
|
|
75
87
|
name: 'files',
|
|
76
88
|
// 发送到后台的文件名
|
package/lib/utils/form.js
CHANGED
|
@@ -202,7 +202,7 @@ var dataFormat = exports.dataFormat = function dataFormat() {
|
|
|
202
202
|
default:
|
|
203
203
|
result[name] = values[name];
|
|
204
204
|
}
|
|
205
|
-
values = (0, _lodash.omit)(values, [name, "".concat(name, "
|
|
205
|
+
values = (0, _lodash.omit)(values, [name, "".concat(name, "_virtual")]);
|
|
206
206
|
}, {});
|
|
207
207
|
return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, values), data);
|
|
208
208
|
};
|
|
@@ -264,6 +264,7 @@ var getFormColumn = exports.getFormColumn = function getFormColumn() {
|
|
|
264
264
|
key: name
|
|
265
265
|
}, _props));
|
|
266
266
|
},
|
|
267
|
-
field: name
|
|
267
|
+
field: name,
|
|
268
|
+
exportField: (0, _grid.getExportField)(name, formItemType, _props)
|
|
268
269
|
});
|
|
269
270
|
};
|
package/lib/utils/grid.js
CHANGED
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
8
|
exports.getColumnRender = getColumnRender;
|
|
9
|
-
exports.getGridColumn = void 0;
|
|
9
|
+
exports.getGridColumn = exports.getExportField = void 0;
|
|
10
10
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
11
11
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
|
12
12
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
|
@@ -117,6 +117,11 @@ var getAlign = function getAlign(extraData, alignClass) {
|
|
|
117
117
|
return 'left';
|
|
118
118
|
}
|
|
119
119
|
};
|
|
120
|
+
var getExportField = exports.getExportField = function getExportField(name, type, props) {
|
|
121
|
+
var _props$config2;
|
|
122
|
+
if (type === 'number' && (_props$config2 = props.config) !== null && _props$config2 !== void 0 && _props$config2.precision || ['date', 'user', 'select', 'group', 'region', 'upload'].includes(type)) return "".concat(name, "_virtual");
|
|
123
|
+
return;
|
|
124
|
+
};
|
|
120
125
|
var getGridColumn = exports.getGridColumn = function getGridColumn() {
|
|
121
126
|
var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
|
|
122
127
|
comName = _ref.comName,
|
|
@@ -140,6 +145,7 @@ var getGridColumn = exports.getGridColumn = function getGridColumn() {
|
|
|
140
145
|
var _extra = JSON.parse(extra) || {};
|
|
141
146
|
var data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
|
|
142
147
|
field: name,
|
|
148
|
+
exportField: getExportField(name, comName || _form.defaultComName[property], _props),
|
|
143
149
|
title: _props.fieldAliasName || _props.label,
|
|
144
150
|
headerAlign: _props.headerAlign || getAlign(_extra, 'sheading_alignment_virtual'),
|
|
145
151
|
align: _props.align || getAlign(_extra, 'scell_alignment_virtual'),
|
|
@@ -152,8 +158,8 @@ var getGridColumn = exports.getGridColumn = function getGridColumn() {
|
|
|
152
158
|
data.filter = filter;
|
|
153
159
|
data.filterParams = filterParams;
|
|
154
160
|
} else if (!isTreeGrid && !isVirtual) {
|
|
155
|
-
var _props$
|
|
156
|
-
if ((_props.mode || ((_props$
|
|
161
|
+
var _props$config3;
|
|
162
|
+
if ((_props.mode || ((_props$config3 = _props.config) === null || _props$config3 === void 0 ? void 0 : _props$config3.mode)) === 'multiple') {
|
|
157
163
|
data.field = "".concat(name, "_virtual");
|
|
158
164
|
data.filter = 'text';
|
|
159
165
|
return data;
|
|
@@ -204,6 +210,7 @@ var getGridColumn = exports.getGridColumn = function getGridColumn() {
|
|
|
204
210
|
break;
|
|
205
211
|
case 'select':
|
|
206
212
|
case 'radio':
|
|
213
|
+
case 'dict':
|
|
207
214
|
data.filter = 'select';
|
|
208
215
|
if (_props.alias) {
|
|
209
216
|
data.filterParams = {
|
|
@@ -277,6 +284,7 @@ var getGridColumn = exports.getGridColumn = function getGridColumn() {
|
|
|
277
284
|
case 'select':
|
|
278
285
|
case 'group':
|
|
279
286
|
case 'complex':
|
|
287
|
+
case 'dict':
|
|
280
288
|
if (translateProps.multiple) {
|
|
281
289
|
formItemProps = {
|
|
282
290
|
dataFormat: function dataFormat(value) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@luck-design-biz/luckda",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.3-13tl",
|
|
4
4
|
"description": "前端配置管理中心业务组件库",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"start": "cross-env NODE_OPTIONS=--max-old-space-size=10240 USER_RUNTIME=SITE RUNTIME=dev umi dev",
|
|
@@ -108,7 +108,6 @@
|
|
|
108
108
|
"cross-var": "^1.1.0",
|
|
109
109
|
"d3-selection": "^1.4.2",
|
|
110
110
|
"dry-dry": "^0.4.0",
|
|
111
|
-
"enzyme": "^3.11.0",
|
|
112
111
|
"eslint": "^7.32.0",
|
|
113
112
|
"eslint-plugin-babel": "^5.3.1",
|
|
114
113
|
"eslint-plugin-react": "^7.31.10",
|
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"component": "FieldDatadic",
|
|
3
|
-
"name": "数据字典",
|
|
4
|
-
"group": "field",
|
|
5
|
-
"desc": "数据字典类型表单项",
|
|
6
|
-
"icon": "icon-fieldstring",
|
|
7
|
-
"groupName": "表单项",
|
|
8
|
-
"order": 1,
|
|
9
|
-
"display": "select",
|
|
10
|
-
"multiple": false,
|
|
11
|
-
"isTree": false,
|
|
12
|
-
"allowClear": false,
|
|
13
|
-
"advance": {
|
|
14
|
-
"events": {}
|
|
15
|
-
}
|
|
16
|
-
}
|
|
@@ -1,73 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"component": "FieldDatadic",
|
|
3
|
-
"name": "数据字典",
|
|
4
|
-
"group": "field",
|
|
5
|
-
"desc": "数据字典类型表单项",
|
|
6
|
-
"icon": "icon-fieldstring",
|
|
7
|
-
"groupName": "表单项",
|
|
8
|
-
"order": 1,
|
|
9
|
-
"props": [
|
|
10
|
-
{
|
|
11
|
-
"key": "alias",
|
|
12
|
-
"name": "字典key",
|
|
13
|
-
"type": "string"
|
|
14
|
-
},
|
|
15
|
-
{
|
|
16
|
-
"key": "valueField",
|
|
17
|
-
"name": "实际值字段",
|
|
18
|
-
"type": "string"
|
|
19
|
-
},
|
|
20
|
-
{
|
|
21
|
-
"key": "labelField",
|
|
22
|
-
"name": "翻译值字段",
|
|
23
|
-
"type": "string"
|
|
24
|
-
},
|
|
25
|
-
{
|
|
26
|
-
"key": "display",
|
|
27
|
-
"name": "展现形式",
|
|
28
|
-
"type": "segmented",
|
|
29
|
-
"options": [
|
|
30
|
-
{
|
|
31
|
-
"label": "Select",
|
|
32
|
-
"value": "select"
|
|
33
|
-
},
|
|
34
|
-
{
|
|
35
|
-
"label": "Radio",
|
|
36
|
-
"value": "radio"
|
|
37
|
-
}
|
|
38
|
-
],
|
|
39
|
-
"default": "select"
|
|
40
|
-
},
|
|
41
|
-
{
|
|
42
|
-
"key": "multiple",
|
|
43
|
-
"name": "多选",
|
|
44
|
-
"desc": "仅在展现形式为Select时有效",
|
|
45
|
-
"type": "switch",
|
|
46
|
-
"default": false
|
|
47
|
-
},
|
|
48
|
-
{
|
|
49
|
-
"key": "isTree",
|
|
50
|
-
"name": "树形结构",
|
|
51
|
-
"desc": "用于规定树形结构的数据字典,仅在展现形式为Select时有效",
|
|
52
|
-
"type": "switch",
|
|
53
|
-
"default": false
|
|
54
|
-
},
|
|
55
|
-
{
|
|
56
|
-
"key": "allowClear",
|
|
57
|
-
"name": "允许清除",
|
|
58
|
-
"desc": "仅在展现形式为Select时有效",
|
|
59
|
-
"type": "switch",
|
|
60
|
-
"default": false
|
|
61
|
-
}
|
|
62
|
-
],
|
|
63
|
-
"advance": {
|
|
64
|
-
"events": [
|
|
65
|
-
{
|
|
66
|
-
"key": "onChange",
|
|
67
|
-
"name": "数据变化事件",
|
|
68
|
-
"desc": "在数据变化事件时,执行方法",
|
|
69
|
-
"func": "function onChange(data) {\n\t\n}"
|
|
70
|
-
}
|
|
71
|
-
]
|
|
72
|
-
}
|
|
73
|
-
}
|
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"component": "FieldDatadic",
|
|
3
|
-
"name": "数据字典",
|
|
4
|
-
"group": "field",
|
|
5
|
-
"desc": "数据字典类型表单项",
|
|
6
|
-
"icon": "icon-fieldstring",
|
|
7
|
-
"groupName": "表单项",
|
|
8
|
-
"order": 1,
|
|
9
|
-
"display": "select",
|
|
10
|
-
"multiple": false,
|
|
11
|
-
"isTree": false,
|
|
12
|
-
"allowClear": false,
|
|
13
|
-
"advance": {
|
|
14
|
-
"events": {}
|
|
15
|
-
}
|
|
16
|
-
}
|
|
@@ -1,73 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"component": "FieldDatadic",
|
|
3
|
-
"name": "数据字典",
|
|
4
|
-
"group": "field",
|
|
5
|
-
"desc": "数据字典类型表单项",
|
|
6
|
-
"icon": "icon-fieldstring",
|
|
7
|
-
"groupName": "表单项",
|
|
8
|
-
"order": 1,
|
|
9
|
-
"props": [
|
|
10
|
-
{
|
|
11
|
-
"key": "alias",
|
|
12
|
-
"name": "字典key",
|
|
13
|
-
"type": "string"
|
|
14
|
-
},
|
|
15
|
-
{
|
|
16
|
-
"key": "valueField",
|
|
17
|
-
"name": "实际值字段",
|
|
18
|
-
"type": "string"
|
|
19
|
-
},
|
|
20
|
-
{
|
|
21
|
-
"key": "labelField",
|
|
22
|
-
"name": "翻译值字段",
|
|
23
|
-
"type": "string"
|
|
24
|
-
},
|
|
25
|
-
{
|
|
26
|
-
"key": "display",
|
|
27
|
-
"name": "展现形式",
|
|
28
|
-
"type": "segmented",
|
|
29
|
-
"options": [
|
|
30
|
-
{
|
|
31
|
-
"label": "Select",
|
|
32
|
-
"value": "select"
|
|
33
|
-
},
|
|
34
|
-
{
|
|
35
|
-
"label": "Radio",
|
|
36
|
-
"value": "radio"
|
|
37
|
-
}
|
|
38
|
-
],
|
|
39
|
-
"default": "select"
|
|
40
|
-
},
|
|
41
|
-
{
|
|
42
|
-
"key": "multiple",
|
|
43
|
-
"name": "多选",
|
|
44
|
-
"desc": "仅在展现形式为Select时有效",
|
|
45
|
-
"type": "switch",
|
|
46
|
-
"default": false
|
|
47
|
-
},
|
|
48
|
-
{
|
|
49
|
-
"key": "isTree",
|
|
50
|
-
"name": "树形结构",
|
|
51
|
-
"desc": "用于规定树形结构的数据字典,仅在展现形式为Select时有效",
|
|
52
|
-
"type": "switch",
|
|
53
|
-
"default": false
|
|
54
|
-
},
|
|
55
|
-
{
|
|
56
|
-
"key": "allowClear",
|
|
57
|
-
"name": "允许清除",
|
|
58
|
-
"desc": "仅在展现形式为Select时有效",
|
|
59
|
-
"type": "switch",
|
|
60
|
-
"default": false
|
|
61
|
-
}
|
|
62
|
-
],
|
|
63
|
-
"advance": {
|
|
64
|
-
"events": [
|
|
65
|
-
{
|
|
66
|
-
"key": "onChange",
|
|
67
|
-
"name": "数据变化事件",
|
|
68
|
-
"desc": "在数据变化事件时,执行方法",
|
|
69
|
-
"func": "function onChange(data) {\n\t\n}"
|
|
70
|
-
}
|
|
71
|
-
]
|
|
72
|
-
}
|
|
73
|
-
}
|