@rhc-office/sdk 6.6.367 → 6.6.384
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/api/common.d.ts +9 -1
- package/dist/api/common.d.ts.map +1 -1
- package/dist/api/crypto-tool.d.ts +1 -2
- package/dist/api/crypto-tool.d.ts.map +1 -1
- package/dist/api/digital-sign-environment.d.ts +1 -27
- package/dist/api/digital-sign-environment.d.ts.map +1 -1
- package/dist/api/document-tool.d.ts +9 -1
- package/dist/api/document-tool.d.ts.map +1 -1
- package/dist/api/sign-server.d.ts +1 -1
- package/dist/api/sign-server.d.ts.map +1 -1
- package/dist/api/sign-tool.d.ts +1 -7
- package/dist/api/sign-tool.d.ts.map +1 -1
- package/dist/api/ui-tool.d.ts +1 -0
- package/dist/api/ui-tool.d.ts.map +1 -1
- package/dist/browser/document-viewer.js +1 -1
- package/dist/browser/document-viewer.js.map +1 -1
- package/dist/index.js +89 -132
- package/dist/index.js.map +1 -1
- package/dist/index.umd.cjs +1 -1
- package/dist/index.umd.cjs.map +1 -1
- package/dist/tools/UIToolImpl.d.ts +1 -0
- package/dist/tools/UIToolImpl.d.ts.map +1 -1
- package/dist/viewer/DocumentSDK.d.ts +1 -0
- package/dist/viewer/DocumentSDK.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/api/common.ts +11 -1
- package/src/api/crypto-tool.ts +1 -2
- package/src/api/digital-sign-environment.ts +1 -84
- package/src/api/document-tool.ts +9 -1
- package/src/api/sign-server.ts +7 -2
- package/src/api/sign-tool.ts +3 -12
- package/src/api/ui-tool.ts +2 -0
- package/src/tools/DocumentToolImpl.ts +2 -2
- package/src/tools/UIToolImpl.ts +5 -0
- package/src/viewer/DocumentSDK.ts +43 -12
|
@@ -32,6 +32,7 @@ export declare class UIToolImpl implements UITool {
|
|
|
32
32
|
setWatermark: UITool['setWatermark'];
|
|
33
33
|
setCompactMode: UITool['setCompactMode'];
|
|
34
34
|
setRulerVisible: UITool['setRulerVisible'];
|
|
35
|
+
setStatusBarVisible: UITool['setStatusBarVisible'];
|
|
35
36
|
toggleSidebar: UITool['toggleSidebar'];
|
|
36
37
|
enterBookViewMode: UITool['enterBookViewMode'];
|
|
37
38
|
exitBookViewMode: UITool['exitBookViewMode'];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UIToolImpl.d.ts","sourceRoot":"","sources":["../../src/tools/UIToolImpl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAEL,KAAK,wBAAwB,EAE9B,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"UIToolImpl.d.ts","sourceRoot":"","sources":["../../src/tools/UIToolImpl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAEL,KAAK,wBAAwB,EAE9B,MAAM,6BAA6B,CAAC;AAkDrC,qBAAa,UAAW,YAAW,MAAM;IACvC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBAErB,OAAO,EAAE,wBAAwB;IAI7C,eAAe,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAGxC;IAEF,eAAe,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAGxC;IAEF,gBAAgB,EAAE,MAAM,CAAC,kBAAkB,CAAC,CAM1C;IAEF,mBAAmB,EAAE,MAAM,CAAC,qBAAqB,CAAC,CAGhD;IAEF,mBAAmB,EAAE,MAAM,CAAC,qBAAqB,CAAC,CAGhD;IAEF,eAAe,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAUxC;IAEF,mBAAmB,EAAE,MAAM,CAAC,qBAAqB,CAAC,CAGhD;IAEF,mBAAmB,EAAE,MAAM,CAAC,qBAAqB,CAAC,CAGhD;IAEF,cAAc,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAEtC;IAEF,cAAc,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAEtC;IAEF,kBAAkB,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAG9C;IAEF,kBAAkB,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAG9C;IAEF,kBAAkB,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAG9C;IAEF,kBAAkB,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAG9C;IAEF,cAAc,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAEtC;IAEF,cAAc,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAEtC;IAEF,gBAAgB,EAAE,MAAM,CAAC,kBAAkB,CAAC,CAE1C;IAEF,kBAAkB,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAE9C;IAEF,iBAAiB,EAAE,MAAM,CAAC,mBAAmB,CAAC,CAE5C;IAEF,iBAAiB,EAAE,MAAM,CAAC,mBAAmB,CAAC,CAE5C;IAEF,mBAAmB,EAAE,MAAM,CAAC,qBAAqB,CAAC,CAEhD;IAEF,oBAAoB,EAAE,MAAM,CAAC,sBAAsB,CAAC,CAElD;IAEF,wBAAwB,EAAE,MAAM,CAAC,0BAA0B,CAAC,CAE1D;IAEF,oBAAoB,EAAE,MAAM,CAAC,sBAAsB,CAAC,CAElD;IAEF,qBAAqB,EAAE,MAAM,CAAC,uBAAuB,CAAC,CAEpD;IAEF,wBAAwB,EAAE,MAAM,CAAC,0BAA0B,CAAC,CAE1D;IAEF,YAAY,EAAE,MAAM,CAAC,cAAc,CAAC,CAElC;IAEF,cAAc,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAEtC;IAEF,eAAe,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAExC;IAEF,mBAAmB,EAAE,MAAM,CAAC,qBAAqB,CAAC,CAEhD;IAEF,aAAa,EAAE,MAAM,CAAC,eAAe,CAAC,CAEpC;IAEF,iBAAiB,EAAE,MAAM,CAAC,mBAAmB,CAAC,CAE5C;IAEF,gBAAgB,EAAE,MAAM,CAAC,kBAAkB,CAAC,CAE1C;IAEF,mBAAmB,EAAE,MAAM,CAAC,qBAAqB,CAAC,CAEhD;IAEF,iBAAiB,EAAE,MAAM,CAAC,mBAAmB,CAAC,CAE5C;IAEF,cAAc,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAEtC;IAEF,cAAc,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAEtC;IAEF,OAAO,CAAC,sBAAsB;CAG/B"}
|
|
@@ -35,6 +35,7 @@ export declare class DocumentSDK implements IDocumentSDK {
|
|
|
35
35
|
private normalizedConfiguration;
|
|
36
36
|
private runtimeRestoreState;
|
|
37
37
|
private sessionUser?;
|
|
38
|
+
private sessionUserId?;
|
|
38
39
|
private sessionData?;
|
|
39
40
|
private readonly nativeEventCleanupCallbacks;
|
|
40
41
|
private themeCleanup;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DocumentSDK.d.ts","sourceRoot":"","sources":["../../src/viewer/DocumentSDK.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAmB,MAAM,qBAAqB,CAAC;AA+CzE,UAAU,yBAAyB;IACjC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;
|
|
1
|
+
{"version":3,"file":"DocumentSDK.d.ts","sourceRoot":"","sources":["../../src/viewer/DocumentSDK.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/api/common.ts
CHANGED
|
@@ -17,7 +17,17 @@ export interface IKVField {
|
|
|
17
17
|
* 文件上传选项
|
|
18
18
|
*/
|
|
19
19
|
export interface FileUploadOptions {
|
|
20
|
-
|
|
20
|
+
/**
|
|
21
|
+
* multipart/form-data 中承载文件 Blob 的字段名。
|
|
22
|
+
* 默认值: fileUpload
|
|
23
|
+
*/
|
|
24
|
+
fileFieldName?: string;
|
|
25
|
+
|
|
26
|
+
/**
|
|
27
|
+
* @deprecated Use fileFieldName instead. Kept for compatibility with existing integrations.
|
|
28
|
+
*/
|
|
29
|
+
formFiledName?: string;
|
|
30
|
+
|
|
21
31
|
fileName: string;
|
|
22
32
|
}
|
|
23
33
|
|
package/src/api/crypto-tool.ts
CHANGED
|
@@ -5,10 +5,9 @@
|
|
|
5
5
|
* - `SCE`: 基于服务器软件的算法实现
|
|
6
6
|
* - `HCE:*`: 服务器加密机,冒号后为加密机类型
|
|
7
7
|
* - `BeCE`: 浏览器插件
|
|
8
|
-
* - `KolPKI`: 格尔中间件 PKI 服务,USB 硬件 Key
|
|
9
8
|
* - `BJCAPKI`: 北京 CA 中间件 PKI 服务,USB 硬件 Key
|
|
10
9
|
*/
|
|
11
|
-
export type SecurityProviderName = 'CE' | 'SCE' | `HCE:${string}` | 'BeCE' | '
|
|
10
|
+
export type SecurityProviderName = 'CE' | 'SCE' | `HCE:${string}` | 'BeCE' | 'BJCAPKI';
|
|
12
11
|
|
|
13
12
|
export type SecurityProviderInfo = {
|
|
14
13
|
providerName: SecurityProviderName;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export type SignServerAuthSource = 'Password' | 'USBKey' | '
|
|
1
|
+
export type SignServerAuthSource = 'Password' | 'USBKey' | 'Token';
|
|
2
2
|
export type DigitalSignRsaMode = 'auto' | 'rsa' | 'sm2';
|
|
3
3
|
export type SigningDeviceType = 'client' | 'bjca' | 'plugin' | 'kol' | 'hsm' | string;
|
|
4
4
|
export type EdgePosition =
|
|
@@ -20,12 +20,6 @@ export interface DigitalSignSignServerConfig {
|
|
|
20
20
|
defaultLogin: string;
|
|
21
21
|
defaultPassword: string;
|
|
22
22
|
defaultServer: string;
|
|
23
|
-
kol: {
|
|
24
|
-
appId: string;
|
|
25
|
-
appName: string;
|
|
26
|
-
serviceUrl: string;
|
|
27
|
-
token: string;
|
|
28
|
-
};
|
|
29
23
|
macAddress: string;
|
|
30
24
|
token: string;
|
|
31
25
|
usbKey: {
|
|
@@ -40,13 +34,6 @@ export interface DigitalSignDefaultsConfig {
|
|
|
40
34
|
};
|
|
41
35
|
deviceType: SigningDeviceType;
|
|
42
36
|
edgePosition: EdgePosition;
|
|
43
|
-
kol: {
|
|
44
|
-
appId: string;
|
|
45
|
-
appName: string;
|
|
46
|
-
pin: string;
|
|
47
|
-
serviceUrl: string;
|
|
48
|
-
token: string;
|
|
49
|
-
};
|
|
50
37
|
plugin: {
|
|
51
38
|
pin: string;
|
|
52
39
|
usbKeyType: number;
|
|
@@ -66,13 +53,6 @@ export interface DigitalSignDefaultsPatch {
|
|
|
66
53
|
};
|
|
67
54
|
deviceType?: SigningDeviceType;
|
|
68
55
|
edgePosition?: EdgePosition;
|
|
69
|
-
kol?: {
|
|
70
|
-
appId?: string;
|
|
71
|
-
appName?: string;
|
|
72
|
-
pin?: string;
|
|
73
|
-
serviceUrl?: string;
|
|
74
|
-
token?: string;
|
|
75
|
-
};
|
|
76
56
|
plugin?: {
|
|
77
57
|
pin?: string;
|
|
78
58
|
usbKeyType?: number;
|
|
@@ -86,12 +66,6 @@ export interface DigitalSignSignServerPatch {
|
|
|
86
66
|
defaultLogin?: string;
|
|
87
67
|
defaultPassword?: string;
|
|
88
68
|
defaultServer?: string;
|
|
89
|
-
kol?: {
|
|
90
|
-
appId?: string;
|
|
91
|
-
appName?: string;
|
|
92
|
-
serviceUrl?: string;
|
|
93
|
-
token?: string;
|
|
94
|
-
};
|
|
95
69
|
macAddress?: string;
|
|
96
70
|
token?: string;
|
|
97
71
|
usbKey?: {
|
|
@@ -126,13 +100,6 @@ const EMPTY_DIGITAL_SIGN_ENVIRONMENT: DigitalSignEnvironmentConfig = {
|
|
|
126
100
|
},
|
|
127
101
|
deviceType: 'client',
|
|
128
102
|
edgePosition: DEFAULT_EDGE_POSITION,
|
|
129
|
-
kol: {
|
|
130
|
-
appId: '',
|
|
131
|
-
appName: '',
|
|
132
|
-
pin: '',
|
|
133
|
-
serviceUrl: '',
|
|
134
|
-
token: '',
|
|
135
|
-
},
|
|
136
103
|
plugin: {
|
|
137
104
|
pin: '',
|
|
138
105
|
usbKeyType: 14,
|
|
@@ -145,12 +112,6 @@ const EMPTY_DIGITAL_SIGN_ENVIRONMENT: DigitalSignEnvironmentConfig = {
|
|
|
145
112
|
defaultLogin: '',
|
|
146
113
|
defaultPassword: '',
|
|
147
114
|
defaultServer: '',
|
|
148
|
-
kol: {
|
|
149
|
-
appId: '',
|
|
150
|
-
appName: '',
|
|
151
|
-
serviceUrl: '',
|
|
152
|
-
token: '',
|
|
153
|
-
},
|
|
154
115
|
macAddress: '',
|
|
155
116
|
token: '',
|
|
156
117
|
usbKey: {
|
|
@@ -167,13 +128,6 @@ const cloneDefaultsConfig = (config: DigitalSignDefaultsConfig): DigitalSignDefa
|
|
|
167
128
|
},
|
|
168
129
|
deviceType: config.deviceType,
|
|
169
130
|
edgePosition: config.edgePosition,
|
|
170
|
-
kol: {
|
|
171
|
-
appId: config.kol.appId,
|
|
172
|
-
appName: config.kol.appName,
|
|
173
|
-
pin: config.kol.pin,
|
|
174
|
-
serviceUrl: config.kol.serviceUrl,
|
|
175
|
-
token: config.kol.token,
|
|
176
|
-
},
|
|
177
131
|
plugin: {
|
|
178
132
|
pin: config.plugin.pin,
|
|
179
133
|
usbKeyType: config.plugin.usbKeyType,
|
|
@@ -191,12 +145,6 @@ const cloneSignServerConfig = (
|
|
|
191
145
|
defaultLogin: config.defaultLogin,
|
|
192
146
|
defaultPassword: config.defaultPassword,
|
|
193
147
|
defaultServer: config.defaultServer,
|
|
194
|
-
kol: {
|
|
195
|
-
appId: config.kol.appId,
|
|
196
|
-
appName: config.kol.appName,
|
|
197
|
-
serviceUrl: config.kol.serviceUrl,
|
|
198
|
-
token: config.kol.token,
|
|
199
|
-
},
|
|
200
148
|
macAddress: config.macAddress,
|
|
201
149
|
token: config.token,
|
|
202
150
|
usbKey: {
|
|
@@ -221,14 +169,12 @@ const cloneEnvironmentPatch = (patch: DigitalSignEnvironmentPatch): DigitalSignE
|
|
|
221
169
|
? {
|
|
222
170
|
...patch.defaults,
|
|
223
171
|
bjca: patch.defaults.bjca ? { ...patch.defaults.bjca } : undefined,
|
|
224
|
-
kol: patch.defaults.kol ? { ...patch.defaults.kol } : undefined,
|
|
225
172
|
plugin: patch.defaults.plugin ? { ...patch.defaults.plugin } : undefined,
|
|
226
173
|
}
|
|
227
174
|
: undefined,
|
|
228
175
|
signServer: patch.signServer
|
|
229
176
|
? {
|
|
230
177
|
...patch.signServer,
|
|
231
|
-
kol: patch.signServer.kol ? { ...patch.signServer.kol } : undefined,
|
|
232
178
|
usbKey: patch.signServer.usbKey ? { ...patch.signServer.usbKey } : undefined,
|
|
233
179
|
}
|
|
234
180
|
: undefined,
|
|
@@ -249,13 +195,6 @@ const mergeDefaultsPatch = (
|
|
|
249
195
|
},
|
|
250
196
|
deviceType: patch.deviceType ?? base.deviceType,
|
|
251
197
|
edgePosition: patch.edgePosition ?? base.edgePosition,
|
|
252
|
-
kol: {
|
|
253
|
-
appId: patch.kol?.appId ?? base.kol.appId,
|
|
254
|
-
appName: patch.kol?.appName ?? base.kol.appName,
|
|
255
|
-
pin: patch.kol?.pin ?? base.kol.pin,
|
|
256
|
-
serviceUrl: patch.kol?.serviceUrl ?? base.kol.serviceUrl,
|
|
257
|
-
token: patch.kol?.token ?? base.kol.token,
|
|
258
|
-
},
|
|
259
198
|
plugin: {
|
|
260
199
|
pin: patch.plugin?.pin ?? base.plugin.pin,
|
|
261
200
|
usbKeyType: patch.plugin?.usbKeyType ?? base.plugin.usbKeyType,
|
|
@@ -278,12 +217,6 @@ const mergeSignServerPatch = (
|
|
|
278
217
|
defaultLogin: patch.defaultLogin ?? base.defaultLogin,
|
|
279
218
|
defaultPassword: patch.defaultPassword ?? base.defaultPassword,
|
|
280
219
|
defaultServer: patch.defaultServer ?? base.defaultServer,
|
|
281
|
-
kol: {
|
|
282
|
-
appId: patch.kol?.appId ?? base.kol.appId,
|
|
283
|
-
appName: patch.kol?.appName ?? base.kol.appName,
|
|
284
|
-
serviceUrl: patch.kol?.serviceUrl ?? base.kol.serviceUrl,
|
|
285
|
-
token: patch.kol?.token ?? base.kol.token,
|
|
286
|
-
},
|
|
287
220
|
macAddress: patch.macAddress ?? base.macAddress,
|
|
288
221
|
token: patch.token ?? base.token,
|
|
289
222
|
usbKey: {
|
|
@@ -315,13 +248,6 @@ const mergeEnvironmentPatchState = (
|
|
|
315
248
|
...patch.defaults?.bjca,
|
|
316
249
|
}
|
|
317
250
|
: undefined;
|
|
318
|
-
const mergedDefaultsKol =
|
|
319
|
-
base.defaults?.kol || patch.defaults?.kol
|
|
320
|
-
? {
|
|
321
|
-
...base.defaults?.kol,
|
|
322
|
-
...patch.defaults?.kol,
|
|
323
|
-
}
|
|
324
|
-
: undefined;
|
|
325
251
|
const mergedDefaultsPlugin =
|
|
326
252
|
base.defaults?.plugin || patch.defaults?.plugin
|
|
327
253
|
? {
|
|
@@ -329,13 +255,6 @@ const mergeEnvironmentPatchState = (
|
|
|
329
255
|
...patch.defaults?.plugin,
|
|
330
256
|
}
|
|
331
257
|
: undefined;
|
|
332
|
-
const mergedSignServerKol =
|
|
333
|
-
base.signServer?.kol || patch.signServer?.kol
|
|
334
|
-
? {
|
|
335
|
-
...base.signServer?.kol,
|
|
336
|
-
...patch.signServer?.kol,
|
|
337
|
-
}
|
|
338
|
-
: undefined;
|
|
339
258
|
const mergedSignServerUsbKey =
|
|
340
259
|
base.signServer?.usbKey || patch.signServer?.usbKey
|
|
341
260
|
? {
|
|
@@ -351,7 +270,6 @@ const mergeEnvironmentPatchState = (
|
|
|
351
270
|
...base.defaults,
|
|
352
271
|
...patch.defaults,
|
|
353
272
|
...(mergedDefaultsBjca ? { bjca: mergedDefaultsBjca } : {}),
|
|
354
|
-
...(mergedDefaultsKol ? { kol: mergedDefaultsKol } : {}),
|
|
355
273
|
...(mergedDefaultsPlugin ? { plugin: mergedDefaultsPlugin } : {}),
|
|
356
274
|
}
|
|
357
275
|
: undefined,
|
|
@@ -360,7 +278,6 @@ const mergeEnvironmentPatchState = (
|
|
|
360
278
|
? {
|
|
361
279
|
...base.signServer,
|
|
362
280
|
...patch.signServer,
|
|
363
|
-
...(mergedSignServerKol ? { kol: mergedSignServerKol } : {}),
|
|
364
281
|
...(mergedSignServerUsbKey ? { usbKey: mergedSignServerUsbKey } : {}),
|
|
365
282
|
}
|
|
366
283
|
: undefined,
|
package/src/api/document-tool.ts
CHANGED
|
@@ -39,13 +39,21 @@ export interface IFileOpenOptions {
|
|
|
39
39
|
strokeWidth?: number;
|
|
40
40
|
};
|
|
41
41
|
showFileUploadDialog?: boolean;
|
|
42
|
+
closeCurrentDocument?: boolean;
|
|
42
43
|
}
|
|
43
44
|
|
|
44
45
|
export interface IFileSaveOptions {
|
|
45
46
|
/** 静默式 */
|
|
46
47
|
silent?: boolean;
|
|
47
48
|
filename?: string;
|
|
49
|
+
/**
|
|
50
|
+
* multipart/form-data 中承载文件 Blob 的字段名。
|
|
51
|
+
* 默认值: fileUpload
|
|
52
|
+
*/
|
|
53
|
+
fileFieldName?: string;
|
|
48
54
|
format?: IFileSaveFormat;
|
|
55
|
+
formData?: Record<string, string | number | boolean>;
|
|
56
|
+
headers?: Record<string, string>;
|
|
49
57
|
rasterScale?: number;
|
|
50
58
|
jpegQuality?: number;
|
|
51
59
|
pages?: number[];
|
|
@@ -90,7 +98,7 @@ export interface DocumentTool {
|
|
|
90
98
|
|
|
91
99
|
openFromLocalStorage(): void;
|
|
92
100
|
|
|
93
|
-
setUploadUrl(uploadUrl: string): void;
|
|
101
|
+
setUploadUrl(uploadUrl: string, options?: Pick<IFileOpenOptions, 'fileFieldName'>): void;
|
|
94
102
|
|
|
95
103
|
save(
|
|
96
104
|
uploadUrl?: string,
|
package/src/api/sign-server.ts
CHANGED
|
@@ -36,7 +36,12 @@ export interface SignServerTool {
|
|
|
36
36
|
|
|
37
37
|
loginNTKOSignServer(serverAddress: string, login: string, password: string): void;
|
|
38
38
|
|
|
39
|
-
loginSignServer(
|
|
39
|
+
loginSignServer(
|
|
40
|
+
server: string,
|
|
41
|
+
login: string,
|
|
42
|
+
password: string,
|
|
43
|
+
onSuccess?: SignServerAuthCallback,
|
|
44
|
+
): void;
|
|
40
45
|
|
|
41
46
|
signOutSignServer(): void;
|
|
42
47
|
|
|
@@ -49,5 +54,5 @@ export interface SignServerTool {
|
|
|
49
54
|
},
|
|
50
55
|
): void;
|
|
51
56
|
|
|
52
|
-
setUserAuthSource(source: 'Password' | 'USBKey' | '
|
|
57
|
+
setUserAuthSource(source: 'Password' | 'USBKey' | 'Token'): void;
|
|
53
58
|
}
|
package/src/api/sign-tool.ts
CHANGED
|
@@ -32,13 +32,6 @@ export type BrowserCryptoProviderConfiguration = CryptoProviderConfiguration & {
|
|
|
32
32
|
usbKeyType?: USBKeyType;
|
|
33
33
|
};
|
|
34
34
|
|
|
35
|
-
export type KolPkiCryptoProviderConfiguration = CryptoProviderConfiguration & {
|
|
36
|
-
kmsAddress: string;
|
|
37
|
-
appName: string;
|
|
38
|
-
appID: string;
|
|
39
|
-
token: string;
|
|
40
|
-
};
|
|
41
|
-
|
|
42
35
|
export type HceCryptoProviderConfiguration = CryptoProviderConfiguration & {
|
|
43
36
|
kmsAddress?: string;
|
|
44
37
|
svsAddress?: string;
|
|
@@ -52,11 +45,9 @@ export type DigitalSignCryptoProviderConfiguration<
|
|
|
52
45
|
Provider extends SecurityProviderName = SecurityProviderName,
|
|
53
46
|
> = Provider extends 'BeCE'
|
|
54
47
|
? BrowserCryptoProviderConfiguration
|
|
55
|
-
: Provider extends
|
|
56
|
-
?
|
|
57
|
-
:
|
|
58
|
-
? HceCryptoProviderConfiguration
|
|
59
|
-
: CryptoProviderConfiguration;
|
|
48
|
+
: Provider extends `HCE:${string}`
|
|
49
|
+
? HceCryptoProviderConfiguration
|
|
50
|
+
: CryptoProviderConfiguration;
|
|
60
51
|
|
|
61
52
|
export interface DigitalSignTool {
|
|
62
53
|
addDigitalSignatureRetrieveCallback(callback: DigitalSignatureRetrieveCallback): void;
|
package/src/api/ui-tool.ts
CHANGED
|
@@ -129,8 +129,8 @@ export class DocumentToolImpl implements DocumentTool {
|
|
|
129
129
|
return this.adapter.openFromLocalStorage();
|
|
130
130
|
};
|
|
131
131
|
|
|
132
|
-
setUploadUrl: DocumentTool['setUploadUrl'] = (uploadUrl) => {
|
|
133
|
-
return this.adapter.setUploadUrl(uploadUrl);
|
|
132
|
+
setUploadUrl: DocumentTool['setUploadUrl'] = (uploadUrl, options) => {
|
|
133
|
+
return this.adapter.setUploadUrl(uploadUrl, options);
|
|
134
134
|
};
|
|
135
135
|
|
|
136
136
|
save: DocumentTool['save'] = (uploadUrl, onSavedCallback, options) => {
|
package/src/tools/UIToolImpl.ts
CHANGED
|
@@ -37,6 +37,7 @@ const createUIToolDescriptor = (context: BridgeToolAdapterContext): BridgeToolDe
|
|
|
37
37
|
setWatermark: { kind: 'command' },
|
|
38
38
|
setCompactMode: { kind: 'command' },
|
|
39
39
|
setRulerVisible: { kind: 'command' },
|
|
40
|
+
setStatusBarVisible: { kind: 'command' },
|
|
40
41
|
toggleSidebar: { kind: 'command' },
|
|
41
42
|
enterBookViewMode: {
|
|
42
43
|
kind: 'callbackQuery',
|
|
@@ -197,6 +198,10 @@ export class UIToolImpl implements UITool {
|
|
|
197
198
|
return this.adapter.setRulerVisible(visible);
|
|
198
199
|
};
|
|
199
200
|
|
|
201
|
+
setStatusBarVisible: UITool['setStatusBarVisible'] = (visible) => {
|
|
202
|
+
return this.adapter.setStatusBarVisible(visible);
|
|
203
|
+
};
|
|
204
|
+
|
|
200
205
|
toggleSidebar: UITool['toggleSidebar'] = () => {
|
|
201
206
|
return this.adapter.toggleSidebar();
|
|
202
207
|
};
|
|
@@ -61,6 +61,10 @@ interface ReaderHostRuntimeConfig {
|
|
|
61
61
|
baseUrl?: string;
|
|
62
62
|
paths?: Record<string, string | undefined>;
|
|
63
63
|
};
|
|
64
|
+
identity?: {
|
|
65
|
+
sessionUser?: string;
|
|
66
|
+
sessionUserId?: string;
|
|
67
|
+
};
|
|
64
68
|
}
|
|
65
69
|
|
|
66
70
|
type NativeReaderEventName = 'documentLoaded' | 'documentStateChange' | 'documentError';
|
|
@@ -107,6 +111,36 @@ const createReaderPayload = (
|
|
|
107
111
|
};
|
|
108
112
|
};
|
|
109
113
|
|
|
114
|
+
const normalizeSessionUserIdentity = (
|
|
115
|
+
sessionUser: Parameters<IDocumentSDK['setSessionUser']>[0] | undefined,
|
|
116
|
+
sessionUserId: Parameters<IDocumentSDK['setSessionUserId']>[0] | undefined,
|
|
117
|
+
): ReaderHostRuntimeConfig['identity'] | undefined => {
|
|
118
|
+
if (!sessionUser) {
|
|
119
|
+
return undefined;
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
const userName =
|
|
123
|
+
typeof sessionUser === 'string' ? sessionUser.trim() : sessionUser.userName.trim();
|
|
124
|
+
if (!userName) {
|
|
125
|
+
return undefined;
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
const explicitUserId =
|
|
129
|
+
sessionUserId === undefined || sessionUserId === null ? '' : String(sessionUserId).trim();
|
|
130
|
+
const objectUserId =
|
|
131
|
+
typeof sessionUser === 'string' ||
|
|
132
|
+
sessionUser.userId === undefined ||
|
|
133
|
+
sessionUser.userId === null
|
|
134
|
+
? ''
|
|
135
|
+
: String(sessionUser.userId).trim();
|
|
136
|
+
const normalizedUserId = explicitUserId || objectUserId;
|
|
137
|
+
|
|
138
|
+
return {
|
|
139
|
+
sessionUser: userName,
|
|
140
|
+
...(normalizedUserId ? { sessionUserId: normalizedUserId } : {}),
|
|
141
|
+
};
|
|
142
|
+
};
|
|
143
|
+
|
|
110
144
|
const resolveContainerElement = (container: string | HTMLDivElement): HTMLDivElement => {
|
|
111
145
|
if (typeof container === 'string') {
|
|
112
146
|
const element = document.getElementById(container);
|
|
@@ -271,6 +305,7 @@ export class DocumentSDK implements IDocumentSDK {
|
|
|
271
305
|
previousRuntime?: ReaderHostRuntimeConfig;
|
|
272
306
|
} | null = null;
|
|
273
307
|
private sessionUser?: Parameters<IDocumentSDK['setSessionUser']>[0];
|
|
308
|
+
private sessionUserId?: Parameters<IDocumentSDK['setSessionUserId']>[0];
|
|
274
309
|
private sessionData?: string;
|
|
275
310
|
private readonly nativeEventCleanupCallbacks: Array<() => void> = [];
|
|
276
311
|
private themeCleanup: ReaderThemeCleanup | null = null;
|
|
@@ -316,18 +351,7 @@ export class DocumentSDK implements IDocumentSDK {
|
|
|
316
351
|
};
|
|
317
352
|
|
|
318
353
|
readonly setSessionUserId: IDocumentSDK['setSessionUserId'] = (userId): void => {
|
|
319
|
-
|
|
320
|
-
this.sessionUser = {
|
|
321
|
-
userName: typeof this.sessionUser === 'string' ? this.sessionUser : '',
|
|
322
|
-
userId,
|
|
323
|
-
};
|
|
324
|
-
return;
|
|
325
|
-
}
|
|
326
|
-
|
|
327
|
-
this.sessionUser = {
|
|
328
|
-
...this.sessionUser,
|
|
329
|
-
userId,
|
|
330
|
-
};
|
|
354
|
+
this.sessionUserId = userId;
|
|
331
355
|
};
|
|
332
356
|
|
|
333
357
|
readonly setSessionData: IDocumentSDK['setSessionData'] = (sessionData): void => {
|
|
@@ -487,6 +511,11 @@ export class DocumentSDK implements IDocumentSDK {
|
|
|
487
511
|
const shouldUseCompactMode =
|
|
488
512
|
configuration.compactViewer === true && configuration.keepPCMenu !== true;
|
|
489
513
|
readerElement.toggleAttribute('data-sdk-compact-mode', shouldUseCompactMode);
|
|
514
|
+
readerElement.toggleAttribute('data-sdk-ribbon-hidden', configuration.ribbonMenu === false);
|
|
515
|
+
readerElement.toggleAttribute(
|
|
516
|
+
'data-sdk-ribbon-title-hidden',
|
|
517
|
+
configuration.ribbonTitle === false,
|
|
518
|
+
);
|
|
490
519
|
readerElement.setAttribute('language', configuration.language ?? 'zh_CN');
|
|
491
520
|
this.themeCleanup = bindReaderElementTheme(readerElement, configuration.theme);
|
|
492
521
|
this.bindNativeReaderEvents(readerElement);
|
|
@@ -525,11 +554,13 @@ export class DocumentSDK implements IDocumentSDK {
|
|
|
525
554
|
configuration: NormalizedReaderEmbedOptions,
|
|
526
555
|
): void {
|
|
527
556
|
this.restoreReaderRuntimeConfig();
|
|
557
|
+
const identity = normalizeSessionUserIdentity(this.sessionUser, this.sessionUserId);
|
|
528
558
|
const readerHost: ReaderHostRuntimeConfig = {
|
|
529
559
|
hostKind: 'server',
|
|
530
560
|
server: {
|
|
531
561
|
baseUrl: configuration.appUrl,
|
|
532
562
|
},
|
|
563
|
+
...(identity ? { identity } : {}),
|
|
533
564
|
};
|
|
534
565
|
|
|
535
566
|
const runtimeElement = readerElement as ReaderRuntimeElement;
|