@farris/jit-engine 1.4.5 → 1.4.7
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 +8 -4
- package/lib/domstructure/ui/data/fields/form/editable/inputs/reference/lookup_edit.js +7 -1
- package/lib/domstructure/ui/data/fields/form/editable/inputs/reference/lookup_edit.js.map +1 -1
- package/lib/mobileapp/vue/code-generator/devkit-manager/app-indexvue-manager.js +3 -1
- package/lib/mobileapp/vue/code-generator/devkit-manager/app-indexvue-manager.js.map +1 -1
- package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-index-vue-generator.js +9 -9
- package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-index-vue-generator.js.map +1 -1
- package/lib/mobileapp/vue/code-generator/file-generator/page-generator/page-component-generator.js +56 -24
- package/lib/mobileapp/vue/code-generator/file-generator/page-generator/page-component-generator.js.map +1 -1
- package/lib/mobileapp/vue/domstructure/internal-entity/vue-app-index-vue-parameter.js.map +1 -1
- package/lib/template/ui/kendo/lookup.pug +2 -1
- package/lib/template/ui/kendo/table/lookup.pug +2 -1
- package/lib/template/ui/mobilevue/field-set.pug +3 -1
- package/lib/utility/farris-datagrid/lookup-editor.js +9 -1
- package/lib/utility/farris-datagrid/lookup-editor.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -20,7 +20,13 @@ class LookupEdit extends reference_field_1.ReferenceField {
|
|
|
20
20
|
if (!obj) {
|
|
21
21
|
return;
|
|
22
22
|
}
|
|
23
|
-
const keys =
|
|
23
|
+
const keys = `multiSelect,pageSize,pageList,pageIndex,pagination,dialogTitle,showMaxButton,showCloseButton,resizable,
|
|
24
|
+
buttonAlign,mapFields,displayType,clear,enableExtendLoadMethod,editable,noSearch,maxSearechLength,useTip,useFavorite,
|
|
25
|
+
enableToSelect,isRecordSize,expandLevel,enableFullTree,loadTreeDataType,enableClear,panelWidth,panelHeight,
|
|
26
|
+
enableCascade,cascadeStatus,useExtendInfo,extInfoFields,extInfoFormatter,customFormatter,customNavFormatter,
|
|
27
|
+
selectFirstInNav,loadDataWhenOpen,onlySelectLeaf,lookupPickingExpression,viewType,beforeSelectData,enableContextMenu,
|
|
28
|
+
showCheckAll,quickSelect,treeToList,navTreeToList,showNavigation,showCascadeControl,showSelected,useNewLayout,
|
|
29
|
+
enableMultiFieldSearch,getAllChildNodesDefault`;
|
|
24
30
|
Object.keys(obj).forEach(key => {
|
|
25
31
|
if (keys.includes(key)) {
|
|
26
32
|
if (key == "clear") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lookup_edit.js","sourceRoot":"","sources":["../../../../../../../../../src/domstructure/ui/data/fields/form/editable/inputs/reference/lookup_edit.ts"],"names":[],"mappings":";;;AAAA,uDAAmD;AACnD,6DAA4J;AAI5J,MAAa,UAAW,SAAQ,gCAAc;
|
|
1
|
+
{"version":3,"file":"lookup_edit.js","sourceRoot":"","sources":["../../../../../../../../../src/domstructure/ui/data/fields/form/editable/inputs/reference/lookup_edit.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,7 @@ const mobileapp_vue_constant_1 = require("../../utility/mobileapp-vue-constant")
|
|
|
30
30
|
const vue_app_index_extraImports_generator_1 = require("../file-generator/app-generator/vue-app-index-extraImports-generator");
|
|
31
31
|
class AppIndexVueManager {
|
|
32
32
|
static generate(generateParam) {
|
|
33
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
33
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
|
|
34
34
|
const devkitValue = generateParam.value;
|
|
35
35
|
const appIndexResourceGenerator = new vue_app_index_resource_generator_1.VueAppIndexResourceGenerator();
|
|
36
36
|
const appIndexResourceContext = new file_generator_context_1.FileGeneratorContext();
|
|
@@ -54,6 +54,8 @@ class AppIndexVueManager {
|
|
|
54
54
|
indexVueParameter.hasExpressions = ((_d = (_c = generateParam.value.ui) === null || _c === void 0 ? void 0 : _c.module) === null || _d === void 0 ? void 0 : _d.expressions) ? generateParam.value.ui.module.expressions.length > 0 : false;
|
|
55
55
|
indexVueParameter.controlStateExtend = ((_f = (_e = generateParam.value.ui) === null || _e === void 0 ? void 0 : _e.options) === null || _f === void 0 ? void 0 : _f.controlStateExtend) ? generateParam.value.ui.options.controlStateExtend : null;
|
|
56
56
|
indexVueParameter.enableI18n = ((_h = (_g = generateParam.value.ui) === null || _g === void 0 ? void 0 : _g.options) === null || _h === void 0 ? void 0 : _h.enableI18n) ? (_k = (_j = generateParam.value.ui) === null || _j === void 0 ? void 0 : _j.options) === null || _k === void 0 ? void 0 : _k.enableI18n : false;
|
|
57
|
+
const routeStrategy = (_m = (_l = generateParam.value.ui) === null || _l === void 0 ? void 0 : _l.options) === null || _m === void 0 ? void 0 : _m.routeStrategy;
|
|
58
|
+
indexVueParameter.routeStrategy = routeStrategy === 'standard' ? 'standard' : null;
|
|
57
59
|
const indexVueContext = new file_generator_context_1.FileGeneratorContext();
|
|
58
60
|
indexVueContext.basePath = path.normalize(path.join(generateParam.metaDataConfig.publishPath, mobileapp_vue_constant_1.MobileAppVueConstant.SrcPathName, mobileapp_vue_constant_1.MobileAppVueConstant.AppsPathName, generateParam.frm_code));
|
|
59
61
|
indexVueContext.fileName = "index.vue";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-indexvue-manager.js","sourceRoot":"","sources":["../../../../../src/mobileapp/vue/code-generator/devkit-manager/app-indexvue-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAG7B,uHAAgH;AAChH,qFAAgF;AAChF,uGAAiG;AAEjG,6GAAsG;AACtG,gHAAyG;AACzG,iFAA4E;AAC5E,+HAAwH;AAExH,MAAa,kBAAkB;IAC3B,MAAM,CAAC,QAAQ,CAAC,aAGf;;QACG,MAAM,WAAW,GAAc,aAAa,CAAC,KAAK,CAAC;QACnD,MAAM,yBAAyB,GAAiC,IAAI,+DAA4B,EAAE,CAAC;QACnG,MAAM,uBAAuB,GAAyB,IAAI,6CAAoB,EAAE,CAAC;QACjF,uBAAuB,CAAC,iBAAiB,GAAG,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC;QACzE,MAAM,sBAAsB,GAAG,yBAAyB,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC;QAE3F,MAAM,6BAA6B,GAAiC,IAAI,uEAAgC,EAAE,CAAC;QAC3G,MAAM,2BAA2B,GAAyB,IAAI,6CAAoB,EAAE,CAAC;QACrF,2BAA2B,CAAC,iBAAiB,GAAG,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC;QAC3E,MAAM,4BAA4B,GAAG,6BAA6B,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAAC;QAEzG,MAAM,qBAAqB,GAA0B,IAAI,gDAAqB,EAAE,CAAC;QACjF,MAAM,gBAAgB,GAAyB,IAAI,6CAAoB,EAAE,CAAC;QAC1E,MAAM,iBAAiB,GAA0B,qBAAqB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QAGlG,MAAM,iBAAiB,GAA4B,IAAI,qDAAuB,EAAE,CAAC;QACjF,iBAAiB,CAAC,cAAc,GAAG,sBAAsB,CAAC,WAAW,CAAC;QACtE,iBAAiB,CAAC,kBAAkB,GAAG,4BAA4B,CAAC,WAAW,CAAC;QAChF,iBAAiB,CAAC,aAAa,GAAG,iBAAiB,CAAC,WAAW,CAAC;QAChE,iBAAiB,CAAC,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC;QACpD,iBAAiB,CAAC,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC;QACvD,iBAAiB,CAAC,cAAc,GAAG,aAAa,CAAC,cAAc,CAAC;QAChE,iBAAiB,CAAC,SAAS,GAAG,MAAA,MAAA,aAAa,CAAC,KAAK,CAAC,EAAE,0CAAE,OAAO,0CAAE,SAAS,CAAC;QACzE,iBAAiB,CAAC,cAAc,GAAG,CAAA,MAAA,MAAA,aAAa,CAAC,KAAK,CAAC,EAAE,0CAAE,MAAM,0CAAE,WAAW,EAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;QAC7I,iBAAiB,CAAC,kBAAkB,GAAG,CAAA,MAAA,MAAA,aAAa,CAAC,KAAK,CAAC,EAAE,0CAAE,OAAO,0CAAE,kBAAkB,EAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,kBAAkB,
|
|
1
|
+
{"version":3,"file":"app-indexvue-manager.js","sourceRoot":"","sources":["../../../../../src/mobileapp/vue/code-generator/devkit-manager/app-indexvue-manager.ts"],"names":[],"mappings":"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"}
|
package/lib/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-index-vue-generator.js
CHANGED
|
@@ -7,7 +7,7 @@ class VueAppIndexVueGenerator extends abstract_file_generator_1.AbstractFileGene
|
|
|
7
7
|
generate(context) {
|
|
8
8
|
const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
|
|
9
9
|
const appIndexVueParameter = context.externalParameter;
|
|
10
|
-
const { formCode, metaDataConfig, imports, extraImportsString, resourceString, keepAlive, hasExpressions, controlStateExtend, enableI18n } = appIndexVueParameter;
|
|
10
|
+
const { formCode, metaDataConfig, imports, extraImportsString, resourceString, keepAlive, hasExpressions, controlStateExtend, enableI18n, routeStrategy, } = appIndexVueParameter;
|
|
11
11
|
const { serviceUnitPath, projectName, isRuntime, runTimeDimPath } = metaDataConfig;
|
|
12
12
|
const _imports = imports.map((item) => `${item.name}:${item.name},`);
|
|
13
13
|
const generateFormPathValueString = hasExpressions && serviceUnitPath
|
|
@@ -40,22 +40,22 @@ class VueAppIndexVueGenerator extends abstract_file_generator_1.AbstractFileGene
|
|
|
40
40
|
</template>
|
|
41
41
|
|
|
42
42
|
<script>
|
|
43
|
-
import { AppOptions, FORM_PATH_TOKEN, VALIDATION_RULE_TOKEN, CONTROL_STATE_INTERCEPTOR_TOKEN, TranslateService} from '@farris/mobile-devkit';
|
|
43
|
+
import { AppOptions, FORM_PATH_TOKEN, VALIDATION_RULE_TOKEN, CONTROL_STATE_INTERCEPTOR_TOKEN, TranslateService } from '@farris/mobile-devkit';
|
|
44
44
|
import { FrameworkSessionService } from '@farris/mobile-bef';
|
|
45
|
-
import { COMMAND_SERVICES_APP_PROVIDERS, ROUTER_INSTANCE_TOKEN,LangService} from '@farris/mobile-command-services';
|
|
46
|
-
import { DevkitPlugin,beforeRouteEnterByVueAdapter,initdataOptions } from '@farris/mobile-vue-adapter';
|
|
45
|
+
import { COMMAND_SERVICES_APP_PROVIDERS, ROUTER_INSTANCE_TOKEN, LangService } from '@farris/mobile-command-services';
|
|
46
|
+
import { DevkitPlugin, beforeRouteEnterByVueAdapter, initdataOptions, setRouteStrategy } from '@farris/mobile-vue-adapter';
|
|
47
47
|
import { ModelProviders } from './models/model.provider';
|
|
48
48
|
import { validationRule } from './validation';
|
|
49
49
|
${extraImportsString}
|
|
50
50
|
${resourceString}
|
|
51
51
|
${className ? `import { ${className} } from '${path}'` : ''}
|
|
52
52
|
|
|
53
|
-
const dataOptions = {
|
|
53
|
+
const dataOptions = {
|
|
54
54
|
${enableI18n ? `langPath:${langPath}` : ''}
|
|
55
55
|
}
|
|
56
56
|
initdataOptions(dataOptions);
|
|
57
57
|
|
|
58
|
-
export default{
|
|
58
|
+
export default {
|
|
59
59
|
name: '${formCode}',
|
|
60
60
|
components:{${_imports}},
|
|
61
61
|
data() {
|
|
@@ -64,10 +64,10 @@ export default{
|
|
|
64
64
|
};
|
|
65
65
|
},
|
|
66
66
|
beforeRouteEnter(to, from, next) {
|
|
67
|
-
beforeRouteEnterByVueAdapter(to, from, next,dataOptions);
|
|
68
|
-
|
|
67
|
+
beforeRouteEnterByVueAdapter(to, from, next, dataOptions);
|
|
69
68
|
},
|
|
70
|
-
beforeCreate(){
|
|
69
|
+
beforeCreate() {
|
|
70
|
+
setRouteStrategy("${routeStrategy || ''}");
|
|
71
71
|
const appOptions = {
|
|
72
72
|
id: '${formCode}',
|
|
73
73
|
providers: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vue-app-index-vue-generator.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-index-vue-generator.ts"],"names":[],"mappings":";;;AAAA,wEAAkE;AAGlE,wEAAkE;AAWlE,MAAa,uBAAwB,SAAQ,+CAAqB;IAQhE,QAAQ,CAAC,OAA6B;QACpC,MAAM,QAAQ,GAA0B,+CAAqB,CAAC,mBAAmB,EAAE,
|
|
1
|
+
{"version":3,"file":"vue-app-index-vue-generator.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/app-generator/vue-app-index-vue-generator.ts"],"names":[],"mappings":"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"}
|
package/lib/mobileapp/vue/code-generator/file-generator/page-generator/page-component-generator.js
CHANGED
|
@@ -11,6 +11,7 @@ class PageComponentGenerator extends abstract_file_generator_1.AbstractFileGener
|
|
|
11
11
|
const componentId = parameter.componentId;
|
|
12
12
|
const providerName = page_provider_manager_1.PageProviderManager.generateProviderName(componentId);
|
|
13
13
|
const componentConfig = parameter.componentConfig;
|
|
14
|
+
const useNewRouteStrategy = this.isNewRouteStrategy(componentConfig);
|
|
14
15
|
const generateString = `
|
|
15
16
|
<template>
|
|
16
17
|
${parameter.templateHtml}
|
|
@@ -32,7 +33,9 @@ import {
|
|
|
32
33
|
updatedByVueAdapter,
|
|
33
34
|
beforeUnmountByVueAdapter,
|
|
34
35
|
scrollActivated,
|
|
35
|
-
scrollDeactivated
|
|
36
|
+
scrollDeactivated,
|
|
37
|
+
handlePageLevelRouteEnter,
|
|
38
|
+
handlePageLevelRouteLeave,
|
|
36
39
|
} from '@farris/mobile-vue-adapter';
|
|
37
40
|
import {${providerName}} from "./${componentId.toLowerCase()}.provider";
|
|
38
41
|
|
|
@@ -58,7 +61,7 @@ export default
|
|
|
58
61
|
: ''}
|
|
59
62
|
...mapCommandMethods([${this.generateCommands(parameter.commands)}]),
|
|
60
63
|
${this.getGobackCommand(componentConfig)
|
|
61
|
-
?
|
|
64
|
+
? `goBack() { ${useNewRouteStrategy ? '' : 'this.url === document.URL && '}this.$viewModel.` +
|
|
62
65
|
this.getGobackCommand(componentConfig) +
|
|
63
66
|
'();},'
|
|
64
67
|
: ''}
|
|
@@ -86,16 +89,13 @@ export default
|
|
|
86
89
|
: ''}
|
|
87
90
|
${this.getOnBeforeInitCommand(componentConfig)}
|
|
88
91
|
beforeCreateByVueAdapter && beforeCreateByVueAdapter(this);
|
|
89
|
-
// 初始加载数据
|
|
90
|
-
//this.pageLoad();
|
|
91
|
-
//this.$viewModel.load();
|
|
92
92
|
},
|
|
93
93
|
created(){
|
|
94
94
|
${this.getOnInitCommand(componentConfig) ? 'this.pageLoad();' : ''}
|
|
95
95
|
createdByVueAdapter && createdByVueAdapter(this);
|
|
96
96
|
},
|
|
97
97
|
mounted() {
|
|
98
|
-
${componentConfig.keepAlive ? '' : this.getGobackCommandCode(componentConfig)}
|
|
98
|
+
${componentConfig.keepAlive ? '' : this.getGobackCommandCode(componentConfig, useNewRouteStrategy)}
|
|
99
99
|
${componentConfig.keepAlive ? '' : this.getGobackCommandForWF(componentConfig)}
|
|
100
100
|
this.$nextTick(function () {
|
|
101
101
|
this.$bindComponentExtenders(this.$refs);
|
|
@@ -106,13 +106,13 @@ export default
|
|
|
106
106
|
this.$bindComponentExtenders(this.$refs);
|
|
107
107
|
updatedByVueAdapter && updatedByVueAdapter(this);
|
|
108
108
|
},
|
|
109
|
-
${this.generateActivated(componentConfig)}
|
|
109
|
+
${this.generateActivated(componentConfig, useNewRouteStrategy)}
|
|
110
110
|
beforeUnmount() {
|
|
111
111
|
${this.getOnLoadDataCommand(componentConfig)
|
|
112
112
|
? 'this.$app.context.eventBus.unsubscribe("' + componentId + '"),'
|
|
113
113
|
: ''}
|
|
114
|
-
${
|
|
115
|
-
?
|
|
114
|
+
${!componentConfig.keepAlive
|
|
115
|
+
? this.getPageLevelRouteLeaveCode(componentConfig, useNewRouteStrategy)
|
|
116
116
|
: ''}
|
|
117
117
|
this.$unbindComponentExtenders(this.$refs);
|
|
118
118
|
beforeUnmountByVueAdapter && beforeUnmountByVueAdapter(this);
|
|
@@ -126,6 +126,28 @@ ${componentConfig.customClass ? componentConfig.customClass : ''}
|
|
|
126
126
|
this.createFile(context.basePath, context.fileName, generateString);
|
|
127
127
|
return response;
|
|
128
128
|
}
|
|
129
|
+
isNewRouteStrategy(componentConfig) {
|
|
130
|
+
var _a, _b, _c;
|
|
131
|
+
const newRouteStrategy = ['standard'];
|
|
132
|
+
const componentConfigTemplate = componentConfig.template;
|
|
133
|
+
let firstContentComponent;
|
|
134
|
+
if (Array.isArray(componentConfigTemplate)) {
|
|
135
|
+
firstContentComponent = componentConfigTemplate[0];
|
|
136
|
+
}
|
|
137
|
+
else {
|
|
138
|
+
firstContentComponent = componentConfigTemplate;
|
|
139
|
+
}
|
|
140
|
+
if (!firstContentComponent) {
|
|
141
|
+
return false;
|
|
142
|
+
}
|
|
143
|
+
const parentInstance = (_a = firstContentComponent.getContext()) === null || _a === void 0 ? void 0 : _a.getParentInstance();
|
|
144
|
+
const componentContext = parentInstance && parentInstance.componentContext;
|
|
145
|
+
if (!componentContext) {
|
|
146
|
+
return false;
|
|
147
|
+
}
|
|
148
|
+
const routeStrategy = (_c = (_b = componentContext.getModuleContext()) === null || _b === void 0 ? void 0 : _b.getOptions()) === null || _c === void 0 ? void 0 : _c.routeStrategy;
|
|
149
|
+
return newRouteStrategy.includes(routeStrategy);
|
|
150
|
+
}
|
|
129
151
|
getOnInitCommand(componentConfig) {
|
|
130
152
|
if (componentConfig.onInit) {
|
|
131
153
|
return componentConfig.onInit;
|
|
@@ -166,7 +188,6 @@ ${componentConfig.customClass ? componentConfig.customClass : ''}
|
|
|
166
188
|
generateInitPage(componentConfig, from) {
|
|
167
189
|
const providerName = page_provider_manager_1.PageProviderManager.generateProviderName(componentConfig.id);
|
|
168
190
|
return `
|
|
169
|
-
// 创建ViewModel
|
|
170
191
|
const viewModelOptions = {
|
|
171
192
|
id: '${componentConfig.id}',
|
|
172
193
|
${from === 'activated' ? 'keepAlive: true,' : ''}
|
|
@@ -174,19 +195,17 @@ ${componentConfig.customClass ? componentConfig.customClass : ''}
|
|
|
174
195
|
};
|
|
175
196
|
this.$initPage(viewModelOptions);`;
|
|
176
197
|
}
|
|
177
|
-
generateActivated(componentConfig) {
|
|
198
|
+
generateActivated(componentConfig, useNewRouteStrategy) {
|
|
178
199
|
if (componentConfig.keepAlive) {
|
|
179
200
|
return `activated() {
|
|
180
201
|
${this.generateInitPage(componentConfig, 'activated')}
|
|
181
|
-
${this.getGobackCommandCode(componentConfig)}
|
|
202
|
+
${this.getGobackCommandCode(componentConfig, useNewRouteStrategy)}
|
|
182
203
|
${this.getGobackCommandForWF(componentConfig)}
|
|
183
204
|
${this.getOnActivedCommand(componentConfig)}
|
|
184
205
|
scrollActivated && scrollActivated(this);
|
|
185
206
|
},
|
|
186
207
|
deactivated() {
|
|
187
|
-
${componentConfig
|
|
188
|
-
? 'window.removeEventListener("popstate", this.goBack, false); //false阻止默认事件'
|
|
189
|
-
: ''}
|
|
208
|
+
${this.getPageLevelRouteLeaveCode(componentConfig, useNewRouteStrategy)}
|
|
190
209
|
scrollDeactivated && scrollDeactivated(this);
|
|
191
210
|
},`;
|
|
192
211
|
}
|
|
@@ -205,16 +224,29 @@ ${componentConfig.customClass ? componentConfig.customClass : ''}
|
|
|
205
224
|
}
|
|
206
225
|
return '';
|
|
207
226
|
}
|
|
208
|
-
getGobackCommandCode(componentConfig) {
|
|
209
|
-
if (
|
|
210
|
-
return `
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
227
|
+
getGobackCommandCode(componentConfig, useNewRouteStrategy) {
|
|
228
|
+
if (useNewRouteStrategy) {
|
|
229
|
+
return `handlePageLevelRouteEnter(this, this.goBack);`;
|
|
230
|
+
}
|
|
231
|
+
else {
|
|
232
|
+
if (componentConfig.goBack) {
|
|
233
|
+
return `\n` +
|
|
234
|
+
`\t\tif (window.history && window.history.pushState) {\n` +
|
|
235
|
+
`\t\t this.url = document.URL;\n` +
|
|
236
|
+
`\t\t history.pushState(null, null, document.URL);\n` +
|
|
237
|
+
`\t\t window.addEventListener("popstate", this.goBack, false);\n` +
|
|
238
|
+
`\t\t}`;
|
|
239
|
+
}
|
|
240
|
+
return '';
|
|
241
|
+
}
|
|
242
|
+
}
|
|
243
|
+
getPageLevelRouteLeaveCode(componentConfig, useNewRouteStrategy) {
|
|
244
|
+
if (useNewRouteStrategy) {
|
|
245
|
+
return `handlePageLevelRouteLeave(this, this.goBack);`;
|
|
246
|
+
}
|
|
247
|
+
else {
|
|
248
|
+
return componentConfig.goBack ? `window.removeEventListener("popstate", this.goBack, false);` : ``;
|
|
216
249
|
}
|
|
217
|
-
return '';
|
|
218
250
|
}
|
|
219
251
|
}
|
|
220
252
|
exports.PageComponentGenerator = PageComponentGenerator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page-component-generator.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/page-generator/page-component-generator.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"page-component-generator.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/page-generator/page-component-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vue-app-index-vue-parameter.js","sourceRoot":"","sources":["../../../../../src/mobileapp/vue/domstructure/internal-entity/vue-app-index-vue-parameter.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"vue-app-index-vue-parameter.js","sourceRoot":"","sources":["../../../../../src/mobileapp/vue/domstructure/internal-entity/vue-app-index-vue-parameter.ts"],"names":[],"mappings":";;;AAEA,MAAa,uBAAuB;CA2FnC;AA3FD,0DA2FC"}
|
|
@@ -81,7 +81,8 @@ div(class=(variable.appearance && variable.appearance.class) style=(variable.app
|
|
|
81
81
|
'[inputAppendType]'=variable.inputAppendType?"'"+variable.inputAppendType+"'":undefined
|
|
82
82
|
'[inputAppendDisabled]'=variable.inputAppendDisabled?""+variable.inputAppendDisabled.value:undefined
|
|
83
83
|
'(inputAppendClickEvent)'=variable.inputAppendClickEvent?""+variable.inputAppendClickEvent:undefined
|
|
84
|
-
'[inputAppendControlType]'=variable.enableAppend?variable.originalType?"'"+variable.originalType+"'":undefined:undefined
|
|
84
|
+
'[inputAppendControlType]'=variable.enableAppend?variable.originalType?"'"+variable.originalType+"'":undefined:undefined
|
|
85
|
+
'[getAllChildNodesDefault]'=(variable.getAllChildNodesDefault || variable.getAllChildNodesDefault==false)?""+variable.getAllChildNodesDefault:undefined)&attributes(attrs)
|
|
85
86
|
if (variable.needValid && variable.binding && variable.binding.path)
|
|
86
87
|
-var path = `viewModel.form.getCardControlErrors('${variable.binding.path}')`
|
|
87
88
|
validationMessage('[errors]'!=`${path}` '[hidden]'="!viewModel.form.isShowValidationMsg" )
|
|
@@ -50,7 +50,8 @@ div(class="farris-input-wrap")
|
|
|
50
50
|
'[viewType]'=variable.viewType?"'"+variable.viewType+"'":undefined '[target]'="row" '[input-append]'=variable.enableAppend?""+variable.enableAppend.value:undefined '[inputAppendText]'=variable.inputAppendText?"'"+variable.inputAppendText+"'":undefined
|
|
51
51
|
'[inputAppendType]'=variable.inputAppendType?"'"+variable.inputAppendType+"'":undefined '[inputAppendDisabled]'=variable.inputAppendDisabled?""+variable.inputAppendDisabled.value:undefined
|
|
52
52
|
'(inputAppendClickEvent)'=variable.inputAppendClickEvent?""+variable.inputAppendClickEvent:undefined '[inputAppendControlType]'=variable.enableAppend?variable.originalType?"'"+variable.originalType+"'":undefined:undefined '[quickSelect]'=variable.quickSelectName?""+variable.quickSelectName:undefined
|
|
53
|
-
'[showSelected]'=variable.showSelected?""+variable.showSelected.value:undefined '[useNewLayout]'=variable.useNewLayout?""+variable.useNewLayout.value:undefined '[enableMultiFieldSearch]'=variable.enableMultiFieldSearch?""+variable.enableMultiFieldSearch.value:undefined
|
|
53
|
+
'[showSelected]'=variable.showSelected?""+variable.showSelected.value:undefined '[useNewLayout]'=variable.useNewLayout?""+variable.useNewLayout.value:undefined '[enableMultiFieldSearch]'=variable.enableMultiFieldSearch?""+variable.enableMultiFieldSearch.value:undefined
|
|
54
|
+
'[getAllChildNodesDefault]'=(variable.getAllChildNodesDefault || variable.getAllChildNodesDefault==false)?""+variable.getAllChildNodesDefault:undefined)&attributes(attrs)
|
|
54
55
|
div(class="farris-feedback")
|
|
55
56
|
if(variable.isTextArea)
|
|
56
57
|
-var areaAttrs = {};
|
|
@@ -10,7 +10,9 @@ fm-collapse-item(
|
|
|
10
10
|
position=variable.isInner ? 'bottom' : 'top'
|
|
11
11
|
:collapse=variable.collapse?String(variable.collapse): undefined
|
|
12
12
|
)&attributes(attrs)
|
|
13
|
-
if(variable.headerTemplate)
|
|
13
|
+
if(variable.headerTemplate && !/<template\s+#title\s*>/.test(variable.headerTemplate))
|
|
14
14
|
template(#title)
|
|
15
15
|
| !{variable.headerTemplate}
|
|
16
|
+
if(variable.headerTemplate && /<template\s+#title\s*>/.test(variable.headerTemplate))
|
|
17
|
+
| !{variable.headerTemplate}
|
|
16
18
|
| {{content}}
|
|
@@ -17,7 +17,7 @@ class LookupEditor extends abstract_lookup_editor_1.AbstractLookupEditor {
|
|
|
17
17
|
if (!obj) {
|
|
18
18
|
return;
|
|
19
19
|
}
|
|
20
|
-
const keys = `enableContextMenu,showCheckAll,quickSelect,viewType,showSelected,separator,pageSize,pageList`;
|
|
20
|
+
const keys = `enableContextMenu,showCheckAll,quickSelect,viewType,showSelected,separator,pageSize,pageList,getAllChildNodesDefault,enableToSelect`;
|
|
21
21
|
Object.keys(obj).forEach(key => {
|
|
22
22
|
if (keys.includes(key)) {
|
|
23
23
|
if (key == "enableContextMenu" || key == "showCheckAll" || key == 'showSelected') {
|
|
@@ -159,6 +159,14 @@ class LookupEditor extends abstract_lookup_editor_1.AbstractLookupEditor {
|
|
|
159
159
|
generateString += `
|
|
160
160
|
"loadDataWhenOpen": ${this.loadDataWhenOpen.value},`;
|
|
161
161
|
}
|
|
162
|
+
if (this.getAllChildNodesDefault || this.getAllChildNodesDefault === false) {
|
|
163
|
+
generateString += `
|
|
164
|
+
"getAllChildNodesDefault": ${this.getAllChildNodesDefault},`;
|
|
165
|
+
}
|
|
166
|
+
if (this.enableToSelect || this.enableToSelect === false) {
|
|
167
|
+
generateString += `
|
|
168
|
+
"enableToSelect": ${this.enableToSelect},`;
|
|
169
|
+
}
|
|
162
170
|
if (this.useExtendInfo) {
|
|
163
171
|
generateString += `
|
|
164
172
|
"useExtendInfo": ${this.useExtendInfo},`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lookup-editor.js","sourceRoot":"","sources":["../../../src/utility/farris-datagrid/lookup-editor.ts"],"names":[],"mappings":";;;AAAA,0BAAyC;AAEzC,8CAA2C;AAC3C,qEAAgE;AAShE,MAAa,YAAa,SAAQ,6CAAoB;
|
|
1
|
+
{"version":3,"file":"lookup-editor.js","sourceRoot":"","sources":["../../../src/utility/farris-datagrid/lookup-editor.ts"],"names":[],"mappings":"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"}
|