@lingxiteam/ebe-utils 0.3.4 → 0.3.6
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.
|
@@ -938,11 +938,12 @@ const StdUpload = LingxiForwardRef<any, MyStdUploadProps>((props, ref) => {
|
|
|
938
938
|
...(uploadProps?.data || {}),
|
|
939
939
|
};
|
|
940
940
|
if (restProps?.columns) {
|
|
941
|
-
const { _source, _serviceId } = restProps?.columns || {};
|
|
941
|
+
const { _source, _serviceId, serviceCode } = restProps?.columns || {};
|
|
942
942
|
switch (_source) {
|
|
943
943
|
case 'std': {
|
|
944
944
|
data['ORCHESTRATION.appId'] = props.$$componentItem.appId;
|
|
945
945
|
data['ORCHESTRATION.serviceVersionId'] = _serviceId;
|
|
946
|
+
data['ORCHESTRATION.serviceCode'] = serviceCode;
|
|
946
947
|
break;
|
|
947
948
|
}
|
|
948
949
|
default:
|
|
@@ -123,7 +123,7 @@ const ImportBusiObjModal = forwardRef<ImportBusiObjModalHooks, ImportBusiObjModa
|
|
|
123
123
|
// 自定义导入业务对象数据时,busiObjectFields为对象数组格式,其他情况下,busiObjectFields为数组
|
|
124
124
|
const newFields: any = [];
|
|
125
125
|
if (busiObjectFields?.length) {
|
|
126
|
-
curDataSource.forEach(item => {
|
|
126
|
+
curDataSource.forEach((item) => {
|
|
127
127
|
const curField = busiObjectFields.find((field: any) => item.attrCode === field?.code || item.attrCode === field);
|
|
128
128
|
if (curField) {
|
|
129
129
|
nameMap[typeof curField === 'string' ? curField : curField?.code] = item.attrName || item.attrCode;
|
|
@@ -133,13 +133,13 @@ const ImportBusiObjModal = forwardRef<ImportBusiObjModalHooks, ImportBusiObjModa
|
|
|
133
133
|
}
|
|
134
134
|
if (customGroup) {
|
|
135
135
|
// 存在表头分组时,需要记录下导出字段的名称和编码映射,组装分组时需要用到
|
|
136
|
-
curDataSource.forEach(c => {
|
|
136
|
+
curDataSource.forEach((c) => {
|
|
137
137
|
nameMap[c.attrCode] = c.attrName;
|
|
138
138
|
});
|
|
139
139
|
}
|
|
140
140
|
return [newFields, nameMap];
|
|
141
141
|
}
|
|
142
|
-
return [selectedKeys.length ? curDataSource.filter(item => selectedKeys.includes(item.attrCode)) : [], nameMap];
|
|
142
|
+
return [selectedKeys.length ? curDataSource.filter((item) => selectedKeys.includes(item.attrCode)) : [], nameMap];
|
|
143
143
|
}, [selectedKeys, curDataSource, params, isCustom]);
|
|
144
144
|
|
|
145
145
|
const uploadDisabled = useMemo(
|
|
@@ -222,7 +222,7 @@ const ImportBusiObjModal = forwardRef<ImportBusiObjModalHooks, ImportBusiObjModa
|
|
|
222
222
|
if (customGroup && typeof parseGroupFunction === 'function') {
|
|
223
223
|
// 配置了表头分组规则的,进行头部分组组装
|
|
224
224
|
obj.groups = parseGroupFunction({
|
|
225
|
-
list: selectedRows.sort((a, b) => +a?.sort - +b?.sort).map(row => row.attrCode),
|
|
225
|
+
list: selectedRows.sort((a, b) => +a?.sort - +b?.sort).map((row) => row.attrCode),
|
|
226
226
|
groupMap: customGroup,
|
|
227
227
|
nameMap: colNameMap,
|
|
228
228
|
});
|
|
@@ -297,9 +297,9 @@ const ImportBusiObjModal = forwardRef<ImportBusiObjModalHooks, ImportBusiObjModa
|
|
|
297
297
|
|
|
298
298
|
const onCheckAllChange = (e: any) => {
|
|
299
299
|
if (e.target.checked) {
|
|
300
|
-
setSelectedKeys(curDataSource.map(item => item.attrCode));
|
|
300
|
+
setSelectedKeys(curDataSource.map((item) => item.attrCode));
|
|
301
301
|
} else {
|
|
302
|
-
setSelectedKeys(curDataSource.filter(item => item.isRequired === 'T').map(item => item.attrCode));
|
|
302
|
+
setSelectedKeys(curDataSource.filter((item) => item.isRequired === 'T').map((item) => item.attrCode));
|
|
303
303
|
}
|
|
304
304
|
};
|
|
305
305
|
|
|
@@ -329,7 +329,7 @@ const ImportBusiObjModal = forwardRef<ImportBusiObjModalHooks, ImportBusiObjModa
|
|
|
329
329
|
const obj: any = {};
|
|
330
330
|
const { customGroup, exception = {} } = params || {};
|
|
331
331
|
if (exception) {
|
|
332
|
-
Object.keys(exception).forEach(exp => {
|
|
332
|
+
Object.keys(exception).forEach((exp) => {
|
|
333
333
|
obj[exp] = exception[exp];
|
|
334
334
|
});
|
|
335
335
|
}
|
|
@@ -337,7 +337,7 @@ const ImportBusiObjModal = forwardRef<ImportBusiObjModalHooks, ImportBusiObjModa
|
|
|
337
337
|
if (customGroup && typeof parseGroupFunction === 'function') {
|
|
338
338
|
// 配置了表头分组规则的,进行头部分组组装
|
|
339
339
|
obj.groups = parseGroupFunction({
|
|
340
|
-
list: selectedRows.sort((a, b) => +a?.sort - +b?.sort).map(row => row.attrCode),
|
|
340
|
+
list: selectedRows.sort((a, b) => +a?.sort - +b?.sort).map((row) => row.attrCode),
|
|
341
341
|
groupMap: customGroup,
|
|
342
342
|
nameMap: colNameMap,
|
|
343
343
|
});
|
|
@@ -357,7 +357,7 @@ const ImportBusiObjModal = forwardRef<ImportBusiObjModalHooks, ImportBusiObjModa
|
|
|
357
357
|
),
|
|
358
358
|
};
|
|
359
359
|
}
|
|
360
|
-
const { _source, _serviceId } = params.custUrl || {};
|
|
360
|
+
const { _source, _serviceId, serviceCode } = params.custUrl || {};
|
|
361
361
|
const customParams: any = {
|
|
362
362
|
param: new Blob([JSON.stringify({ ...(params.custParams || {}), ...obj })], { type: 'application/json' }),
|
|
363
363
|
};
|
|
@@ -365,6 +365,7 @@ const ImportBusiObjModal = forwardRef<ImportBusiObjModalHooks, ImportBusiObjModa
|
|
|
365
365
|
// 自定义导出勾选了编排类服务
|
|
366
366
|
// customParams['ORCHESTRATION.appId'] = appId;
|
|
367
367
|
customParams['ORCHESTRATION.serviceVersionId'] = _serviceId;
|
|
368
|
+
customParams['ORCHESTRATION.serviceCode'] = serviceCode;
|
|
368
369
|
}
|
|
369
370
|
return customParams;
|
|
370
371
|
}, [isCustomService, selectedRows, params, colNameMap]);
|
|
@@ -473,7 +474,7 @@ const ImportBusiObjModal = forwardRef<ImportBusiObjModalHooks, ImportBusiObjModa
|
|
|
473
474
|
new Promise((res, rej) => {
|
|
474
475
|
resolve = res;
|
|
475
476
|
update();
|
|
476
|
-
}).then(p => {
|
|
477
|
+
}).then((p) => {
|
|
477
478
|
if (timeRef?.current) {
|
|
478
479
|
window.clearTimeout(timeRef?.current);
|
|
479
480
|
timeRef.current = null;
|
|
@@ -485,7 +486,7 @@ const ImportBusiObjModal = forwardRef<ImportBusiObjModalHooks, ImportBusiObjModa
|
|
|
485
486
|
|
|
486
487
|
// 后端返回处理所有列表,前端需要进行解析区分出成功与失败的列表
|
|
487
488
|
const parseSuccess = (result: any, isAsyncImport = false) => {
|
|
488
|
-
return new Promise(resolve => {
|
|
489
|
+
return new Promise((resolve) => {
|
|
489
490
|
if (params?.exception?.partialImport !== 'T') {
|
|
490
491
|
// 非部分导入时,存在失败的条目则表示导入失败
|
|
491
492
|
let fail: any[] = [];
|
|
@@ -495,9 +496,9 @@ const ImportBusiObjModal = forwardRef<ImportBusiObjModalHooks, ImportBusiObjModa
|
|
|
495
496
|
resolve(
|
|
496
497
|
isAsyncImport
|
|
497
498
|
? {
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
|
|
499
|
+
...result,
|
|
500
|
+
isAsyncImport,
|
|
501
|
+
}
|
|
501
502
|
: { success: fail ? [] : result, fail: fail ? result : [] }
|
|
502
503
|
);
|
|
503
504
|
} else {
|
|
@@ -509,7 +510,7 @@ const ImportBusiObjModal = forwardRef<ImportBusiObjModalHooks, ImportBusiObjModa
|
|
|
509
510
|
setTimeout(() => {
|
|
510
511
|
const parse = (list: any[]) => {
|
|
511
512
|
const curList = list.slice(0, 50);
|
|
512
|
-
curList.forEach(l => {
|
|
513
|
+
curList.forEach((l) => {
|
|
513
514
|
if (l.failReason) {
|
|
514
515
|
res.fail.push(l);
|
|
515
516
|
} else {
|
|
@@ -556,13 +557,13 @@ const ImportBusiObjModal = forwardRef<ImportBusiObjModalHooks, ImportBusiObjModa
|
|
|
556
557
|
const file = _fileList[0];
|
|
557
558
|
formData.append(baseUploadProps.name || 'file', file);
|
|
558
559
|
if (Object.keys(uploadPropsData)?.length) {
|
|
559
|
-
Object.keys(uploadPropsData).forEach(key => {
|
|
560
|
+
Object.keys(uploadPropsData).forEach((key) => {
|
|
560
561
|
formData.append(key, uploadPropsData[key]);
|
|
561
562
|
});
|
|
562
563
|
}
|
|
563
564
|
importList.current = [];
|
|
564
565
|
xhr.open('post', baseUploadProps.action as string);
|
|
565
|
-
Object.keys(baseUploadProps.headers || {}).forEach(c => {
|
|
566
|
+
Object.keys(baseUploadProps.headers || {}).forEach((c) => {
|
|
566
567
|
xhr.setRequestHeader(c, (baseUploadProps.headers || {})[c]);
|
|
567
568
|
});
|
|
568
569
|
xhr.setRequestHeader(
|
|
@@ -578,7 +579,7 @@ const ImportBusiObjModal = forwardRef<ImportBusiObjModalHooks, ImportBusiObjModa
|
|
|
578
579
|
// 后端解析结束触发回调,终止进度
|
|
579
580
|
let finishFn: any;
|
|
580
581
|
xhr.upload.onprogress = ({ loaded }) => {
|
|
581
|
-
setProgress(pre => ({
|
|
582
|
+
setProgress((pre) => ({
|
|
582
583
|
...pre,
|
|
583
584
|
upload: +((loaded / file.size) * 100).toFixed(2),
|
|
584
585
|
}));
|
|
@@ -677,7 +678,7 @@ const ImportBusiObjModal = forwardRef<ImportBusiObjModalHooks, ImportBusiObjModa
|
|
|
677
678
|
const uploadProps: UploadProps = {
|
|
678
679
|
...baseUploadProps,
|
|
679
680
|
// @ts-ignore
|
|
680
|
-
onChange: async info => {
|
|
681
|
+
onChange: async (info) => {
|
|
681
682
|
if (!info.file.status) {
|
|
682
683
|
return;
|
|
683
684
|
}
|
|
@@ -815,7 +816,7 @@ const ImportBusiObjModal = forwardRef<ImportBusiObjModalHooks, ImportBusiObjModa
|
|
|
815
816
|
<div className="content">{getLocale('ExpBusiObjModal.downloadFailReason', '下载导入失败数据,查看失败原因')}</div>
|
|
816
817
|
<a
|
|
817
818
|
href="javascript:void(0);"
|
|
818
|
-
onClick={e => {
|
|
819
|
+
onClick={(e) => {
|
|
819
820
|
e.preventDefault();
|
|
820
821
|
getWorkBookTemplate(DownloadType.downloadFail);
|
|
821
822
|
}}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lingxiteam/ebe-utils",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.6",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"author": "",
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
"@babel/types": "^7.12.12",
|
|
20
20
|
"cac": "^6.7.14",
|
|
21
21
|
"fs-extra": "9.x",
|
|
22
|
-
"@lingxiteam/ebe": "0.3.
|
|
22
|
+
"@lingxiteam/ebe": "0.3.6"
|
|
23
23
|
},
|
|
24
24
|
"publishConfig": {
|
|
25
25
|
"access": "public"
|