@farris/jit-engine 1.3.156-dev-20221223 → 1.3.156-dev-20221227
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/README.md +4 -0
- package/lib/domstructure/ui/farris-fileupload-preview/farris-file-upload-preview.js +1 -1
- package/lib/domstructure/ui/oa-relation/oa-relation.js +7 -2
- package/lib/domstructure/ui/oa-relation/oa-relation.js.map +1 -1
- package/lib/template/ui/kendo/farris-file-upload-preview.pug +0 -1
- package/lib/template/ui/kendo/oa-relation.pug +2 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -22,7 +22,7 @@ class FarrisFileUploadAndPreview extends base_title_component_1.BaseTitleCompone
|
|
|
22
22
|
if (!obj) {
|
|
23
23
|
return;
|
|
24
24
|
}
|
|
25
|
-
const keys = 'rootId,formId,uploadSelectText,uploadEnableMulti,uploadedCount,enableUploadedCount,extendDatas,uploadOptions,fUploadDoneEvent,fUploadRemovedEvent,previewReadonly,previewVisible,previewEnableMulti,previewEnableRename,previewDefaultRename,fileRemoveEvent,uploadVisible,uploadDisabled,fieldIdKey,fileNameKey,contentFill,enableOrder,orderField,afterOrdered,showFileList,showHeader
|
|
25
|
+
const keys = 'rootId,formId,uploadSelectText,uploadEnableMulti,uploadedCount,enableUploadedCount,extendDatas,uploadOptions,fUploadDoneEvent,fUploadRemovedEvent,previewReadonly,previewVisible,previewEnableMulti,previewEnableRename,previewDefaultRename,fileRemoveEvent,uploadVisible,uploadDisabled,fieldIdKey,fileNameKey,contentFill,enableOrder,orderField,afterOrdered,showFileList,showHeader';
|
|
26
26
|
Object.keys(obj).forEach(key => {
|
|
27
27
|
if (keys.includes(key)) {
|
|
28
28
|
if (key == "formId") {
|
|
@@ -17,20 +17,25 @@ class OaRelation extends data_1.FormField {
|
|
|
17
17
|
if (!obj) {
|
|
18
18
|
return;
|
|
19
19
|
}
|
|
20
|
-
const keys = 'title,farrisOaRelationDataMapping,path';
|
|
20
|
+
const keys = 'title,farrisOaRelationDataMapping,path,taskCategoryIds';
|
|
21
21
|
Object.keys(obj).forEach(key => {
|
|
22
22
|
if (keys.includes(key)) {
|
|
23
23
|
if (key == 'path') {
|
|
24
24
|
this['formControlName'] = obj[key];
|
|
25
25
|
}
|
|
26
26
|
else {
|
|
27
|
-
|
|
27
|
+
if (obj[key] || obj[key] == false) {
|
|
28
|
+
this[key] = obj[key];
|
|
29
|
+
}
|
|
28
30
|
}
|
|
29
31
|
}
|
|
30
32
|
});
|
|
31
33
|
if (this.path) {
|
|
32
34
|
this.procInstId = "this.viewModel.bindingData." + this.path;
|
|
33
35
|
}
|
|
36
|
+
if (this.taskCategoryIds) {
|
|
37
|
+
this.taskCategoryIds = `'${this.taskCategoryIds}'`;
|
|
38
|
+
}
|
|
34
39
|
this.placeHolderResourceId = utility_1.I18nResourceManager.generatePlaceHolderResourceId("OaRelation", this.id, this.resourcePrefix);
|
|
35
40
|
}
|
|
36
41
|
toJSON() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oa-relation.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/oa-relation/oa-relation.ts"],"names":[],"mappings":";;;AAAA,8CAAmE;AACnE,kCAAoC;AAMpC,MAAa,UAAW,SAAQ,gBAAS;
|
|
1
|
+
{"version":3,"file":"oa-relation.js","sourceRoot":"","sources":["../../../../src/domstructure/ui/oa-relation/oa-relation.ts"],"names":[],"mappings":";;;AAAA,8CAAmE;AACnE,kCAAoC;AAMpC,MAAa,UAAW,SAAQ,gBAAS;IAKrC,YAAY,KAAmB;QAC3B,KAAK,CAAC,KAAK,CAAC,CAAC;QAJjB,cAAS,GAAG,EAAE,CAAC;QAKX,IAAI,GAAQ,CAAC;QACb,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,GAAG,GAAG,oBAAU,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;SAClD;aAAM;YACH,GAAG,GAAG,KAAK,CAAC;SACf;QAED,IAAI,CAAC,GAAG,EAAE;YACN,OAAO;SACV;QAED,MAAM,IAAI,GAAG,wDAAwD,CAAC;QACtE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACpB,IAAI,GAAG,IAAI,MAAM,EAAE;oBACf,IAAI,CAAC,iBAAiB,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;iBACtC;qBAAM;oBACH,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,EAAE;wBAC/B,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;qBACxB;iBACJ;aACJ;QACL,CAAC,CAAC,CAAC;QACH,IAAI,IAAI,CAAC,IAAI,EAAE;YACX,IAAI,CAAC,UAAU,GAAG,6BAA6B,GAAG,IAAI,CAAC,IAAI,CAAC;SAC/D;QAED,IAAI,IAAI,CAAC,eAAe,EAAE;YACtB,IAAI,CAAC,eAAe,GAAG,IAAI,IAAI,CAAC,eAAe,GAAG,CAAC;SACtD;QACD,IAAI,CAAC,qBAAqB,GAAG,6BAAmB,CAAC,6BAA6B,CAAC,YAAY,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IAC/H,CAAC;IAED,MAAM;QACF,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE;YACrC,MAAM,EAAE,YAAY;SACvB,CAAC,CAAC;IACP,CAAC;IAED,QAAQ;QACJ,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACzC,CAAC;IAMD,MAAM,CAAC,OAAO;QACV,OAAO,YAAY,CAAC;IACxB,CAAC;CACJ;AAzDD,gCAyDC"}
|
|
@@ -26,7 +26,6 @@ f-file-upload-and-preview(id=variable.replacedId class=(variable.appearance && v
|
|
|
26
26
|
'(fUploadRemovedEvent)'=variable.fUploadRemovedEvent?""+variable.fUploadRemovedEvent:undefined
|
|
27
27
|
'[previewEnableRename]'=""+variable.previewEnableRename
|
|
28
28
|
'[previewDefaultRename]'=variable.previewDefaultNameLangName?""+variable.previewDefaultNameLangName:undefined
|
|
29
|
-
'[customInfo]'=variable.customInfoLangName?""+variable.customInfoLangName:undefined
|
|
30
29
|
'[contentFill]'=variable.contentFill?""+variable.contentFill.value:undefined
|
|
31
30
|
'(afterOrdered)'=variable.afterOrdered?""+variable.afterOrdered:undefined
|
|
32
31
|
'[enableOrder]'=variable.enableOrder?""+variable.enableOrder.value:undefined
|
|
@@ -8,6 +8,7 @@ div(class=(variable.appearance && variable.appearance.class) style=(variable.app
|
|
|
8
8
|
'farrisOaRelationDataMapping'
|
|
9
9
|
input-end-edit
|
|
10
10
|
id=variable.replacedId
|
|
11
|
-
'[readonly]'!=variable.readonly?variable.readonly.value+"":undefined
|
|
11
|
+
'[readonly]'!=variable.readonly?variable.readonly.value+"":undefined
|
|
12
|
+
'[taskCategoryIds]'!=variable.taskCategoryIds?variable.taskCategoryIds+"":undefined
|
|
12
13
|
'formControlName'=variable.formControlName?""+variable.formControlName:undefined
|
|
13
14
|
)
|