@farris/jit-engine 1.4.8 → 1.4.9
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 +6 -6
- package/lib/mobileapp/vue/code-generator/devkit-manager/app-indexvue-manager.js +1 -3
- 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 +24 -56
- 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/mobilevue/field-set.pug +1 -3
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -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;
|
|
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,8 +54,6 @@ 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;
|
|
59
57
|
const indexVueContext = new file_generator_context_1.FileGeneratorContext();
|
|
60
58
|
indexVueContext.basePath = path.normalize(path.join(generateParam.metaDataConfig.publishPath, mobileapp_vue_constant_1.MobileAppVueConstant.SrcPathName, mobileapp_vue_constant_1.MobileAppVueConstant.AppsPathName, generateParam.frm_code));
|
|
61
59
|
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
|
|
10
|
+
const { formCode, metaDataConfig, imports, extraImportsString, resourceString, keepAlive, hasExpressions, controlStateExtend, enableI18n } = 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
|
|
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,
|
|
46
|
-
import { DevkitPlugin,
|
|
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';
|
|
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,
|
|
67
|
+
beforeRouteEnterByVueAdapter(to, from, next,dataOptions);
|
|
68
|
+
|
|
68
69
|
},
|
|
69
|
-
beforeCreate()
|
|
70
|
-
setRouteStrategy("${routeStrategy || ''}");
|
|
70
|
+
beforeCreate(){
|
|
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,7 +11,6 @@ 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);
|
|
15
14
|
const generateString = `
|
|
16
15
|
<template>
|
|
17
16
|
${parameter.templateHtml}
|
|
@@ -33,9 +32,7 @@ import {
|
|
|
33
32
|
updatedByVueAdapter,
|
|
34
33
|
beforeUnmountByVueAdapter,
|
|
35
34
|
scrollActivated,
|
|
36
|
-
scrollDeactivated
|
|
37
|
-
handlePageLevelRouteEnter,
|
|
38
|
-
handlePageLevelRouteLeave,
|
|
35
|
+
scrollDeactivated
|
|
39
36
|
} from '@farris/mobile-vue-adapter';
|
|
40
37
|
import {${providerName}} from "./${componentId.toLowerCase()}.provider";
|
|
41
38
|
|
|
@@ -61,7 +58,7 @@ export default
|
|
|
61
58
|
: ''}
|
|
62
59
|
...mapCommandMethods([${this.generateCommands(parameter.commands)}]),
|
|
63
60
|
${this.getGobackCommand(componentConfig)
|
|
64
|
-
?
|
|
61
|
+
? 'goBack() { this.url === document.URL && this.$viewModel.' +
|
|
65
62
|
this.getGobackCommand(componentConfig) +
|
|
66
63
|
'();},'
|
|
67
64
|
: ''}
|
|
@@ -89,13 +86,16 @@ export default
|
|
|
89
86
|
: ''}
|
|
90
87
|
${this.getOnBeforeInitCommand(componentConfig)}
|
|
91
88
|
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)}
|
|
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)}
|
|
110
110
|
beforeUnmount() {
|
|
111
111
|
${this.getOnLoadDataCommand(componentConfig)
|
|
112
112
|
? 'this.$app.context.eventBus.unsubscribe("' + componentId + '"),'
|
|
113
113
|
: ''}
|
|
114
|
-
${!componentConfig.keepAlive
|
|
115
|
-
?
|
|
114
|
+
${componentConfig.goBack && !componentConfig.keepAlive
|
|
115
|
+
? 'window.removeEventListener("popstate", this.goBack, false); //false阻止默认事件'
|
|
116
116
|
: ''}
|
|
117
117
|
this.$unbindComponentExtenders(this.$refs);
|
|
118
118
|
beforeUnmountByVueAdapter && beforeUnmountByVueAdapter(this);
|
|
@@ -126,28 +126,6 @@ ${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
|
-
}
|
|
151
129
|
getOnInitCommand(componentConfig) {
|
|
152
130
|
if (componentConfig.onInit) {
|
|
153
131
|
return componentConfig.onInit;
|
|
@@ -188,6 +166,7 @@ ${componentConfig.customClass ? componentConfig.customClass : ''}
|
|
|
188
166
|
generateInitPage(componentConfig, from) {
|
|
189
167
|
const providerName = page_provider_manager_1.PageProviderManager.generateProviderName(componentConfig.id);
|
|
190
168
|
return `
|
|
169
|
+
// 创建ViewModel
|
|
191
170
|
const viewModelOptions = {
|
|
192
171
|
id: '${componentConfig.id}',
|
|
193
172
|
${from === 'activated' ? 'keepAlive: true,' : ''}
|
|
@@ -195,17 +174,19 @@ ${componentConfig.customClass ? componentConfig.customClass : ''}
|
|
|
195
174
|
};
|
|
196
175
|
this.$initPage(viewModelOptions);`;
|
|
197
176
|
}
|
|
198
|
-
generateActivated(componentConfig
|
|
177
|
+
generateActivated(componentConfig) {
|
|
199
178
|
if (componentConfig.keepAlive) {
|
|
200
179
|
return `activated() {
|
|
201
180
|
${this.generateInitPage(componentConfig, 'activated')}
|
|
202
|
-
${this.getGobackCommandCode(componentConfig
|
|
181
|
+
${this.getGobackCommandCode(componentConfig)}
|
|
203
182
|
${this.getGobackCommandForWF(componentConfig)}
|
|
204
183
|
${this.getOnActivedCommand(componentConfig)}
|
|
205
184
|
scrollActivated && scrollActivated(this);
|
|
206
185
|
},
|
|
207
186
|
deactivated() {
|
|
208
|
-
${
|
|
187
|
+
${componentConfig.goBack
|
|
188
|
+
? 'window.removeEventListener("popstate", this.goBack, false); //false阻止默认事件'
|
|
189
|
+
: ''}
|
|
209
190
|
scrollDeactivated && scrollDeactivated(this);
|
|
210
191
|
},`;
|
|
211
192
|
}
|
|
@@ -224,29 +205,16 @@ ${componentConfig.customClass ? componentConfig.customClass : ''}
|
|
|
224
205
|
}
|
|
225
206
|
return '';
|
|
226
207
|
}
|
|
227
|
-
getGobackCommandCode(componentConfig
|
|
228
|
-
if (
|
|
229
|
-
return `
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
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);` : ``;
|
|
208
|
+
getGobackCommandCode(componentConfig) {
|
|
209
|
+
if (componentConfig.goBack) {
|
|
210
|
+
return `
|
|
211
|
+
if (window.history && window.history.pushState) {
|
|
212
|
+
this.url = document.URL
|
|
213
|
+
history.pushState(null, null, document.URL);
|
|
214
|
+
window.addEventListener("popstate", this.goBack, false); //false阻止默认事件
|
|
215
|
+
}`;
|
|
249
216
|
}
|
|
217
|
+
return '';
|
|
250
218
|
}
|
|
251
219
|
}
|
|
252
220
|
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":";;;AAAA,wEAAkE;AAGlE,wEAAkE;AAElE,oFAA8E;AAY9E,MAAa,sBAAuB,SAAQ,+CAAqB;IAC/D,QAAQ,CAAC,OAA6B;QACpC,MAAM,QAAQ,GAA0B,+CAAqB,CAAC,mBAAmB,EAAE,CAAA;QACnF,MAAM,SAAS,GAAsC,OAAO,CAAC,iBAAiB,CAAA;QAC9E,MAAM,WAAW,GAAW,SAAS,CAAC,WAAW,CAAA;QACjD,MAAM,YAAY,GAAG,2CAAmB,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAA;QAC1E,MAAM,eAAe,GAAuB,SAAS,CAAC,eAAe,CAAA;QACrE,MAAM,cAAc,GAAG;;EAEzB,SAAS,CAAC,YAAY;;;;;;;;;;;;;;;;;;;;;UAqBd,YAAY,aAAa,WAAW,CAAC,WAAW,EAAE;;EAE1D,SAAS,CAAC,YAAY;EACtB,SAAS,CAAC,cAAc,CAAC,MAAM;;;;cAInB,SAAS,CAAC,kBAAkB;;;;;;;;;;;;UAahC,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC;YACpC,CAAC,CAAC,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,GAAG,IAAI;YAC/D,CAAC,CAAC,EACN;gCACwB,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,QAAQ,CAAC;UAE/D,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC;YACpC,CAAC,CAAC,0DAA0D;gBAC1D,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC;gBACtC,OAAO;YACT,CAAC,CAAC,EACN;UACE,SAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAE;;;;;;WAMlD,CAAA,CAAC,CAAC,EAAE;;;;UAIL,SAAS,CAAC,eAAe;UACzB,SAAS,CAAC,cAAc,CAAC,QAAQ;;;UAGjC,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC;UAEtC,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC;YACxC,CAAC,CAAC,wCAAwC;gBACxC,WAAW;gBACX,kDAAkD;gBAClD,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC;gBAC1C,MAAM;YACR,CAAC,CAAC,EACN;UACE,IAAI,CAAC,sBAAsB,CAAC,eAAe,CAAC;;;;;;;UAO5C,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE;;;;UAIhE,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC;UAC3E,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC;;;;;;;;;;MAUhF,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC;;UAGnC,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC;YACxC,CAAC,CAAC,0CAA0C,GAAG,WAAW,GAAG,KAAK;YAClE,CAAC,CAAC,EACN;UAEE,eAAe,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS;YAClD,CAAC,CAAC,2EAA2E;YAC7E,CAAC,CAAC,EACN;;;;;;;EAON,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;;CAE/D,CAAA;QAEG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAA;QAEnE,OAAO,QAAQ,CAAA;IACjB,CAAC;IAUO,gBAAgB,CAAC,eAAmC;QAC1D,IAAI,eAAe,CAAC,MAAM,EAAE;YAC1B,OAAO,eAAe,CAAC,MAAM,CAAA;SAC9B;QACD,OAAO,EAAE,CAAA;IACX,CAAC;IACO,sBAAsB,CAAC,eAAmC;QAChE,IAAI,eAAe,CAAC,YAAY,EAAE;YAChC,OAAO,eAAe,CAAC,YAAY,CAAA;SACpC;QACD,OAAO,EAAE,CAAA;IACX,CAAC;IACO,mBAAmB,CAAC,eAAmC;QAC7D,IAAI,eAAe,CAAC,SAAS,EAAE;YAC7B,OAAO,eAAe,CAAC,SAAS,CAAA;SACjC;QACD,OAAO,EAAE,CAAA;IACX,CAAC;IACO,oBAAoB,CAAC,eAAmC;QAC9D,IAAI,eAAe,CAAC,UAAU,EAAE;YAC9B,OAAO,eAAe,CAAC,UAAU,CAAA;SAClC;QACD,OAAO,EAAE,CAAA;IACX,CAAC;IACO,gBAAgB,CAAC,QAA4B;QACnD,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,EAAE,CAAA;SACV;QACD,IAAI,cAAc,GAAG,EAAE,CAAA;QACvB,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAsB,EAAE,KAAa,EAAE,EAAE;YACzD,cAAc,IAAI,GAAG,GAAG,IAAI,CAAC,IAAI,GAAG,GAAG,CAAA;YACvC,IAAI,KAAK,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC/B,cAAc,IAAI,GAAG,CAAA;aACtB;QACH,CAAC,CAAC,CAAA;QACF,OAAO,cAAc,CAAA;IACvB,CAAC;IAEO,gBAAgB,CAAC,eAAmC,EAAE,IAAa;QACzE,MAAM,YAAY,GAAG,2CAAmB,CAAC,oBAAoB,CAAC,eAAe,CAAC,EAAE,CAAC,CAAA;QACjF,OAAO;;;aAGE,eAAe,CAAC,EAAE;QACvB,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE;mBACnC,YAAY;;sCAEO,CAAA;IACpC,CAAC;IAEO,iBAAiB,CAAC,eAAmC;QAC3D,IAAI,eAAe,CAAC,SAAS,EAAE;YAC7B,OAAO;UACH,IAAI,CAAC,gBAAgB,CAAC,eAAe,EAAE,WAAW,CAAC;UACnD,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC;UAC1C,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC;UAC3C,IAAI,CAAC,mBAAmB,CAAC,eAAe,CAAC;;;;UAKzC,eAAe,CAAC,MAAM;gBACpB,CAAC,CAAC,2EAA2E;gBAC7E,CAAC,CAAC,EACN;;OAED,CAAA;SACF;QACD,OAAO,EAAE,CAAA;IACX,CAAC;IACO,qBAAqB,CAAC,eAAmC;QAC/D,IAAI,eAAe,CAAC,WAAW,EAAE;YAC/B,OAAO;yDAC4C,eAAe,CAAC,WAAW,GAAG,CAAA;SAClF;QACD,OAAO,EAAE,CAAA;IACX,CAAC;IACO,gBAAgB,CAAC,eAAmC;QAC1D,IAAI,eAAe,CAAC,MAAM,EAAE;YAC1B,OAAO,eAAe,CAAC,MAAM,CAAA;SAC9B;QACD,OAAO,EAAE,CAAA;IACX,CAAC;IACO,oBAAoB,CAAC,eAAmC;QAC9D,IAAI,eAAe,CAAC,MAAM,EAAE;YAC1B,OAAO;;;;;UAKH,CAAA;SACL;QACD,OAAO,EAAE,CAAA;IACX,CAAC;CACF;AA7OD,wDA6OC"}
|
|
@@ -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":";;;AACA,MAAa,uBAAuB;CAmFnC;AAnFD,0DAmFC"}
|
|
@@ -10,9 +10,7 @@ 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)
|
|
14
14
|
template(#title)
|
|
15
15
|
| !{variable.headerTemplate}
|
|
16
|
-
if(variable.headerTemplate && /<template\s+#title\s*>/.test(variable.headerTemplate))
|
|
17
|
-
| !{variable.headerTemplate}
|
|
18
16
|
| {{content}}
|