@farris/jit-engine 1.4.112 → 1.4.113
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/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-expression.js +6 -4
- package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-expression.js.map +1 -1
- package/lib/mobileapp/vue/domstructure/ui/business/attachment/attachment-file.js +4 -1
- package/lib/mobileapp/vue/domstructure/ui/business/attachment/attachment-file.js.map +1 -1
- package/lib/template/ui/mobilevue/attachment-file.pug +1 -1
- package/package.json +4 -4
package/README.md
CHANGED
|
@@ -19,13 +19,15 @@ class VueAppExpressionGenerator extends abstract_file_generator_1.AbstractFileGe
|
|
|
19
19
|
this.initFieldMap(context.externalParameter);
|
|
20
20
|
expressions.forEach((item, index) => {
|
|
21
21
|
const field = this.fieldMap.get(item.fieldId);
|
|
22
|
-
if (!field) {
|
|
23
|
-
return
|
|
22
|
+
if (!field && item.sourceType !== 'Container') {
|
|
23
|
+
return;
|
|
24
24
|
}
|
|
25
25
|
if (generateString.endsWith('}')) {
|
|
26
26
|
generateString += ',';
|
|
27
27
|
}
|
|
28
|
-
const path = field
|
|
28
|
+
const path = field
|
|
29
|
+
? (field.bindTo === '/' ? field.binding : field.bindTo + '/' + field.binding)
|
|
30
|
+
: item.fieldId;
|
|
29
31
|
const viewModelId = item.viewModelId ? item.viewModelId : '';
|
|
30
32
|
const _expressions = item.expression
|
|
31
33
|
? item.expression.map((el) => {
|
|
@@ -44,7 +46,7 @@ class VueAppExpressionGenerator extends abstract_file_generator_1.AbstractFileGe
|
|
|
44
46
|
{
|
|
45
47
|
"path": "${path.replace(/\./g, '/')}",
|
|
46
48
|
"ns": "",
|
|
47
|
-
"type": "Field",
|
|
49
|
+
"type": ${item.sourceType === 'Container' ? `"Container"` : `"Field"`},
|
|
48
50
|
"viewModelId":"${viewModelId}",
|
|
49
51
|
"expressions": ${JSON.stringify(_expressions)}
|
|
50
52
|
}`;
|
package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-expression.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vue-app-expression.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-expression.ts"],"names":[],"mappings":";;;AAAA,wEAAkE;AAGlE,wEAAkE;AAUlE,MAAa,yBAA0B,SAAQ,+CAAqB;IAApE;;QACE,aAAQ,GAAqB,IAAI,GAAG,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"vue-app-expression.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-expression.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ class VueAttachmentFile extends vue_base_component_1.VueBaseComponent {
|
|
|
20
20
|
}
|
|
21
21
|
const keys = `title,visible,attachmentPath,disabled,removable,hideUploadBtn,hideDeleteBtn,remove,afterAppendFile,
|
|
22
22
|
binding,parentDirName,rootId,maxSize,maxCount,allowMaxSize,allowMaxCount,uploadOptions,data,sizeList,require,allowOnlyUploadImage,
|
|
23
|
-
showActualImage,imagePreviewType,listItemDisplayMode,headerTemplate,photoWatermarkOptions,afterTakePhoto`;
|
|
23
|
+
showActualImage,imagePreviewType,listItemDisplayMode,headerTemplate,photoWatermarkOptions,afterTakePhoto,filter`;
|
|
24
24
|
Object.keys(obj).forEach((key) => {
|
|
25
25
|
if (!keys.includes(key)) {
|
|
26
26
|
return;
|
|
@@ -35,6 +35,9 @@ class VueAttachmentFile extends vue_base_component_1.VueBaseComponent {
|
|
|
35
35
|
this[key] = lodash_1.isObject(obj[key]) ? JSON.stringify(obj[key]).replace(/"/g, "'") : obj[key];
|
|
36
36
|
}
|
|
37
37
|
});
|
|
38
|
+
if (!this.filter) {
|
|
39
|
+
this.filter = 'null';
|
|
40
|
+
}
|
|
38
41
|
this.initI18nAttrs();
|
|
39
42
|
}
|
|
40
43
|
initI18nAttrs() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attachment-file.js","sourceRoot":"","sources":["../../../../../../../src/mobileapp/vue/domstructure/ui/business/attachment/attachment-file.ts"],"names":[],"mappings":";;;AAAA,mCAAiC;AACjC,iEAA4D;AAC5D,mDAA+D;AAE/D,0DAAsD;AAEtD,MAAa,iBAAkB,SAAQ,qCAAgB;IAcrD,YAAY,KAAU,EAAE,OAAyB;QAC/C,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAEtB,IAAI,GAAQ,CAAA;QACZ,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;SACxB;aAAM;YACL,GAAG,GAAG,KAAK,CAAA;SACZ;QAED,IAAI,CAAC,GAAG,EAAE;YACR,OAAM;SACP;QAED,MAAM,IAAI,GAAG;;
|
|
1
|
+
{"version":3,"file":"attachment-file.js","sourceRoot":"","sources":["../../../../../../../src/mobileapp/vue/domstructure/ui/business/attachment/attachment-file.ts"],"names":[],"mappings":";;;AAAA,mCAAiC;AACjC,iEAA4D;AAC5D,mDAA+D;AAE/D,0DAAsD;AAEtD,MAAa,iBAAkB,SAAQ,qCAAgB;IAcrD,YAAY,KAAU,EAAE,OAAyB;QAC/C,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAEtB,IAAI,GAAQ,CAAA;QACZ,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;SACxB;aAAM;YACL,GAAG,GAAG,KAAK,CAAA;SACZ;QAED,IAAI,CAAC,GAAG,EAAE;YACR,OAAM;SACP;QAED,MAAM,IAAI,GAAG;;oHAEmG,CAAC;QAEjH,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAC/B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACvB,OAAO;aACR;YACD,IAAI,GAAG,KAAK,SAAS,EAAE;gBACrB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,GAAG,CAAC,GAAG,CAAC,KAAK,QAAQ,IAAI,OAAO,GAAG,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;aAChG;iBAAM,IAAI,GAAG,CAAC,IAAI,KAAK,iBAAiB,IAAI,GAAG,KAAK,SAAS,EAAE;gBAC9D,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,wBAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;aACrC;iBAAM;gBACL,IAAI,CAAC,GAAG,CAAC,GAAG,iBAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;aACzF;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;SACtB;QAED,IAAI,CAAC,aAAa,EAAE,CAAA;IACtB,CAAC;IAKO,aAAa;QACnB,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,0BAAmB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;SACzD;aAAM;YACL,IAAI,CAAC,SAAS,GAAG,0BAAmB,CAAC,0BAA0B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAC7E;IACH,CAAC;CACF;AA9DD,8CA8DC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
-var type = variable.type ? String(variable.type) : undefined;
|
|
2
2
|
-var entityData = type === 'AttachmentInput' ? '[currentEntityData]' : 'entityListData';
|
|
3
|
-
-var fileList = variable.attachmentPath ? `$filterAttachment(${variable.data ? variable.data : entityData
|
|
3
|
+
-var fileList = variable.attachmentPath ? `$filterAttachment(${variable.data ? variable.data : entityData}, '${variable.attachmentPath}', '${variable.rootId}', true, false, $viewModel, ${variable.filter})` : '[]';
|
|
4
4
|
-var require = variable.require ? String(variable.require) : undefined;
|
|
5
5
|
-var isInForm = type === 'AttachmentInput';
|
|
6
6
|
-var ref = variable.replacedId? String(variable.replacedId+"_div") : undefined
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"_from": "@farris/jit-engine@latest",
|
|
3
|
-
"_id": "@farris/jit-engine@1.4.
|
|
3
|
+
"_id": "@farris/jit-engine@1.4.113",
|
|
4
4
|
"_inBundle": false,
|
|
5
5
|
"_integrity": "sha512-uchHW0jitxXM1PrqfgD79UDPwrst80fb/a9YW6nimqfmeyYT7o4kwC0iHJdisD1FH0eYFxutFmydn5BiDln0Lg==",
|
|
6
6
|
"_location": "/@farris/jit-engine",
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"#USER",
|
|
21
21
|
"/"
|
|
22
22
|
],
|
|
23
|
-
"_resolved": "https://registry.npmjs.org/@farris/jit-engine/-/jit-engine-1.4.
|
|
23
|
+
"_resolved": "https://registry.npmjs.org/@farris/jit-engine/-/jit-engine-1.4.113.tgz",
|
|
24
24
|
"_shasum": "f4cfbb3859fe8215bc8d788f4e4966fff4d3fdc5",
|
|
25
25
|
"_spec": "@farris/jit-engine@latest",
|
|
26
26
|
"author": {
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
"yargs": "^12.0.1"
|
|
41
41
|
},
|
|
42
42
|
"deprecated": false,
|
|
43
|
-
"description": "1.4.
|
|
43
|
+
"description": "1.4.113",
|
|
44
44
|
"devDependencies": {
|
|
45
45
|
"@types/fs-extra": "^8.1.1",
|
|
46
46
|
"@types/jest": "24.0.15",
|
|
@@ -81,5 +81,5 @@
|
|
|
81
81
|
"tslint": "tslint -c tslint.json -p tsconfig.json",
|
|
82
82
|
"watch-test": "npm run test --watchAll"
|
|
83
83
|
},
|
|
84
|
-
"version": "1.4.
|
|
84
|
+
"version": "1.4.113"
|
|
85
85
|
}
|