mirror of
https://github.com/zen-browser/pdf.js.git
synced 2025-07-09 09:45:42 +02:00
JS - Handle correctly hierarchy of fields (#13133)
* JS - Handle correctly hierarchy of fields - it aims to fix #13132; - annotations can inherit their actions from the parent field; - there are some fields which act as a container for other fields: - they can be access through js so need to add them with an empty type (nothing in the spec about that but checked in Acrobat); - calculation order list (CO) can reference them so need make them through this.getField; - getArray method must return kids. - field values are number, string, ... depending of their type but nothing in the spec on how to know what's the type: - according to the comment for Canonical Format: https://www.adobe.com/content/dam/acom/en/devnet/pdf/pdfs/PDF32000_2008.pdf#page=461 - it seems that this "type" can be guessed from js action Format (when setting a type in Acrobat DC, the only affected thing is this action). - util.scand with an empty string returns the current date.
This commit is contained in:
parent
75a6b2fa13
commit
84d7cccb1d
13 changed files with 337 additions and 106 deletions
|
@ -13,6 +13,14 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
const FieldType = {
|
||||
none: 0,
|
||||
number: 1,
|
||||
percent: 2,
|
||||
date: 3,
|
||||
time: 4,
|
||||
};
|
||||
|
||||
function createActionsMap(actions) {
|
||||
const actionsMap = new Map();
|
||||
if (actions) {
|
||||
|
@ -23,4 +31,28 @@ function createActionsMap(actions) {
|
|||
return actionsMap;
|
||||
}
|
||||
|
||||
export { createActionsMap };
|
||||
function getFieldType(actions) {
|
||||
let format = actions.get("Format");
|
||||
if (!format) {
|
||||
return FieldType.none;
|
||||
}
|
||||
|
||||
format = format[0];
|
||||
|
||||
format = format.trim();
|
||||
if (format.startsWith("AFNumber_")) {
|
||||
return FieldType.number;
|
||||
}
|
||||
if (format.startsWith("AFPercent_")) {
|
||||
return FieldType.percent;
|
||||
}
|
||||
if (format.startsWith("AFDate_")) {
|
||||
return FieldType.date;
|
||||
}
|
||||
if (format.startsWith("AFTime__")) {
|
||||
return FieldType.time;
|
||||
}
|
||||
return FieldType.none;
|
||||
}
|
||||
|
||||
export { createActionsMap, FieldType, getFieldType };
|
||||
|
|
|
@ -187,16 +187,27 @@ class EventDispatcher {
|
|||
continue;
|
||||
}
|
||||
|
||||
event.value = null;
|
||||
const target = this._objects[targetId];
|
||||
this.runActions(source, target, event, "Calculate");
|
||||
if (!event.rc) {
|
||||
continue;
|
||||
}
|
||||
if (event.value !== null) {
|
||||
target.wrapped.value = event.value;
|
||||
}
|
||||
|
||||
event.value = target.obj.value;
|
||||
this.runActions(target, target, event, "Validate");
|
||||
if (!event.rc) {
|
||||
continue;
|
||||
}
|
||||
|
||||
target.wrapped.value = event.value;
|
||||
event.value = target.obj.value;
|
||||
this.runActions(target, target, event, "Format");
|
||||
target.wrapped.valueAsString = event.value;
|
||||
if (event.value !== null) {
|
||||
target.wrapped.valueAsString = event.value;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -13,8 +13,8 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
import { createActionsMap, FieldType, getFieldType } from "./common.js";
|
||||
import { Color } from "./color.js";
|
||||
import { createActionsMap } from "./common.js";
|
||||
import { PDFObject } from "./pdf_object.js";
|
||||
|
||||
class Field extends PDFObject {
|
||||
|
@ -82,8 +82,11 @@ class Field extends PDFObject {
|
|||
this._textColor = data.textColor || ["G", 0];
|
||||
this._value = data.value || "";
|
||||
this._valueAsString = data.valueAsString;
|
||||
this._kidIds = data.kidIds || null;
|
||||
this._fieldType = getFieldType(this._actions);
|
||||
|
||||
this._globalEval = data.globalEval;
|
||||
this._appObjects = data.appObjects;
|
||||
}
|
||||
|
||||
get currentValueIndices() {
|
||||
|
@ -200,7 +203,23 @@ class Field extends PDFObject {
|
|||
}
|
||||
|
||||
set value(value) {
|
||||
this._value = value;
|
||||
if (value === "") {
|
||||
this._value = "";
|
||||
} else if (typeof value === "string") {
|
||||
switch (this._fieldType) {
|
||||
case FieldType.number:
|
||||
case FieldType.percent:
|
||||
value = parseFloat(value);
|
||||
if (!isNaN(value)) {
|
||||
this._value = value;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
this._value = value;
|
||||
}
|
||||
} else {
|
||||
this._value = value;
|
||||
}
|
||||
if (this._isChoice) {
|
||||
if (this.multipleSelection) {
|
||||
const values = new Set(value);
|
||||
|
@ -332,6 +351,10 @@ class Field extends PDFObject {
|
|||
}
|
||||
|
||||
getArray() {
|
||||
if (this._kidIds) {
|
||||
return this._kidIds.map(id => this._appObjects[id].wrapped);
|
||||
}
|
||||
|
||||
if (this._children === null) {
|
||||
this._children = this._document.obj._getChildren(this._fieldPath);
|
||||
}
|
||||
|
|
|
@ -67,20 +67,39 @@ function initSandbox(params) {
|
|||
});
|
||||
|
||||
const util = new Util({ externalCall });
|
||||
const appObjects = app._objects;
|
||||
|
||||
if (data.objects) {
|
||||
const annotations = [];
|
||||
|
||||
for (const [name, objs] of Object.entries(data.objects)) {
|
||||
const obj = objs[0];
|
||||
obj.send = send;
|
||||
annotations.length = 0;
|
||||
let container = null;
|
||||
|
||||
for (const obj of objs) {
|
||||
if (obj.type !== "") {
|
||||
annotations.push(obj);
|
||||
} else {
|
||||
container = obj;
|
||||
}
|
||||
}
|
||||
|
||||
let obj = container;
|
||||
if (annotations.length > 0) {
|
||||
obj = annotations[0];
|
||||
obj.send = send;
|
||||
}
|
||||
|
||||
obj.globalEval = globalEval;
|
||||
obj.doc = _document;
|
||||
obj.fieldPath = name;
|
||||
obj.appObjects = appObjects;
|
||||
let field;
|
||||
if (obj.type === "radiobutton") {
|
||||
const otherButtons = objs.slice(1);
|
||||
const otherButtons = annotations.slice(1);
|
||||
field = new RadioButtonField(otherButtons, obj);
|
||||
} else if (obj.type === "checkbox") {
|
||||
const otherButtons = objs.slice(1);
|
||||
const otherButtons = annotations.slice(1);
|
||||
field = new CheckboxField(otherButtons, obj);
|
||||
} else {
|
||||
field = new Field(obj);
|
||||
|
@ -90,7 +109,10 @@ function initSandbox(params) {
|
|||
doc._addField(name, wrapped);
|
||||
const _object = { obj: field, wrapped };
|
||||
for (const object of objs) {
|
||||
app._objects[object.id] = _object;
|
||||
appObjects[object.id] = _object;
|
||||
}
|
||||
if (container) {
|
||||
appObjects[container.id] = _object;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -372,6 +372,10 @@ class Util extends PDFObject {
|
|||
}
|
||||
|
||||
scand(cFormat, cDate) {
|
||||
if (cDate === "") {
|
||||
return new Date();
|
||||
}
|
||||
|
||||
switch (cFormat) {
|
||||
case 0:
|
||||
return this.scand("D:yyyymmddHHMMss", cDate);
|
||||
|
@ -525,14 +529,14 @@ class Util extends PDFObject {
|
|||
}
|
||||
);
|
||||
|
||||
this._scandCache.set(cFormat, [new RegExp(re, "g"), actions]);
|
||||
this._scandCache.set(cFormat, [re, actions]);
|
||||
}
|
||||
|
||||
const [regexForFormat, actions] = this._scandCache.get(cFormat);
|
||||
const [re, actions] = this._scandCache.get(cFormat);
|
||||
|
||||
const matches = regexForFormat.exec(cDate);
|
||||
if (matches.length !== actions.length + 1) {
|
||||
throw new Error("Invalid date in util.scand");
|
||||
const matches = new RegExp(re, "g").exec(cDate);
|
||||
if (!matches || matches.length !== actions.length + 1) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const data = {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue