@ibiz-template/runtime 0.7.41-alpha.121 → 0.7.41-alpha.122
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/dist/index.esm.js +12 -1
- package/dist/index.system.min.js +1 -1
- package/out/controller/utils/data-file-util/data-file-util.d.ts +13 -0
- package/out/controller/utils/data-file-util/data-file-util.d.ts.map +1 -1
- package/out/controller/utils/data-file-util/data-file-util.js +20 -1
- package/package.json +2 -2
- package/src/controller/utils/data-file-util/data-file-util.ts +35 -2
|
@@ -11,9 +11,22 @@ export type ImportDataResult = {
|
|
|
11
11
|
*/
|
|
12
12
|
cancel?: boolean;
|
|
13
13
|
total?: number;
|
|
14
|
+
/**
|
|
15
|
+
* 成功导入的数量
|
|
16
|
+
*/
|
|
14
17
|
success?: number;
|
|
18
|
+
/**
|
|
19
|
+
* 返回内容
|
|
20
|
+
*/
|
|
15
21
|
message?: string;
|
|
22
|
+
/**
|
|
23
|
+
* 返回的错误信息
|
|
24
|
+
*/
|
|
16
25
|
errorMessage?: string;
|
|
26
|
+
/**
|
|
27
|
+
* 错误文件数据
|
|
28
|
+
*/
|
|
29
|
+
errorfile?: IData;
|
|
17
30
|
};
|
|
18
31
|
export type IExportDataResult = {
|
|
19
32
|
ok: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-file-util.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/data-file-util/data-file-util.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAIb,cAAc,EAEf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIpE,OAAO,EAAe,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AASrE,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"data-file-util.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/data-file-util/data-file-util.ts"],"names":[],"mappings":"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"}
|
|
@@ -114,7 +114,26 @@ export async function importData(file, appDataEntity, dataImport, context, param
|
|
|
114
114
|
});
|
|
115
115
|
// 模拟表单通知 刷新表格
|
|
116
116
|
ibiz.mc.command.send({ srfdecodename: appDataEntity.codeName }, 'OBJECTCREATED', 'DATAIMPORT');
|
|
117
|
-
|
|
117
|
+
if (res.ok && res.data) {
|
|
118
|
+
Object.assign(result, res.data);
|
|
119
|
+
// 如果有返回errormessage则使用errormessage
|
|
120
|
+
if (res.data && res.data.errormessage && !res.data.message) {
|
|
121
|
+
result.message = res.data.errormessage;
|
|
122
|
+
}
|
|
123
|
+
// 如果没有返回message但是有errorinfo则拼接errorinfo作为message
|
|
124
|
+
if (res.data &&
|
|
125
|
+
res.data.errorinfo &&
|
|
126
|
+
!res.data.message &&
|
|
127
|
+
!res.data.errormessage) {
|
|
128
|
+
const errorInfos = Object.values(res.data.errorinfo);
|
|
129
|
+
if (errorInfos.length > 0) {
|
|
130
|
+
result.message = errorInfos
|
|
131
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
132
|
+
.map((item) => item.errorInfo)
|
|
133
|
+
.join('\r\n');
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
}
|
|
118
137
|
}
|
|
119
138
|
catch (error) {
|
|
120
139
|
if (error instanceof Error) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ibiz-template/runtime",
|
|
3
|
-
"version": "0.7.41-alpha.
|
|
3
|
+
"version": "0.7.41-alpha.122",
|
|
4
4
|
"description": "运行时逻辑库",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "out/index.js",
|
|
@@ -70,5 +70,5 @@
|
|
|
70
70
|
"qx-util": "^0.4.8",
|
|
71
71
|
"ramda": "^0.29.0"
|
|
72
72
|
},
|
|
73
|
-
"gitHead": "
|
|
73
|
+
"gitHead": "224827aa2d5ada83b9ce9d40ec647ad561772549"
|
|
74
74
|
}
|
|
@@ -30,9 +30,22 @@ export type ImportDataResult = {
|
|
|
30
30
|
cancel?: boolean;
|
|
31
31
|
// 下面的是同步导入才有的属性
|
|
32
32
|
total?: number;
|
|
33
|
+
/**
|
|
34
|
+
* 成功导入的数量
|
|
35
|
+
*/
|
|
33
36
|
success?: number;
|
|
37
|
+
/**
|
|
38
|
+
* 返回内容
|
|
39
|
+
*/
|
|
34
40
|
message?: string;
|
|
41
|
+
/**
|
|
42
|
+
* 返回的错误信息
|
|
43
|
+
*/
|
|
35
44
|
errorMessage?: string;
|
|
45
|
+
/**
|
|
46
|
+
* 错误文件数据
|
|
47
|
+
*/
|
|
48
|
+
errorfile?: IData;
|
|
36
49
|
};
|
|
37
50
|
|
|
38
51
|
// 导出结果类型
|
|
@@ -179,8 +192,28 @@ export async function importData(
|
|
|
179
192
|
'OBJECTCREATED',
|
|
180
193
|
'DATAIMPORT',
|
|
181
194
|
);
|
|
182
|
-
|
|
183
|
-
|
|
195
|
+
if (res.ok && res.data) {
|
|
196
|
+
Object.assign(result, res.data);
|
|
197
|
+
// 如果有返回errormessage则使用errormessage
|
|
198
|
+
if (res.data && res.data.errormessage && !res.data.message) {
|
|
199
|
+
result.message = res.data.errormessage;
|
|
200
|
+
}
|
|
201
|
+
// 如果没有返回message但是有errorinfo则拼接errorinfo作为message
|
|
202
|
+
if (
|
|
203
|
+
res.data &&
|
|
204
|
+
res.data.errorinfo &&
|
|
205
|
+
!res.data.message &&
|
|
206
|
+
!res.data.errormessage
|
|
207
|
+
) {
|
|
208
|
+
const errorInfos = Object.values(res.data.errorinfo);
|
|
209
|
+
if (errorInfos.length > 0) {
|
|
210
|
+
result.message = errorInfos
|
|
211
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
212
|
+
.map((item: any) => item.errorInfo)
|
|
213
|
+
.join('\r\n');
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
}
|
|
184
217
|
} catch (error) {
|
|
185
218
|
if (error instanceof Error) {
|
|
186
219
|
result.errorMessage = error.message;
|