@farris/jit-engine 1.3.227 → 1.3.229-dev

package/lib/mobileapp/vue/code-generator/file-generator/page-generator/page-component-generator.js.map

@@ -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":"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"}
+{"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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"}

package/lib/mobileapp/vue/code-generator/file-generator/page-generator/page-form-generator.js

@@ -12,60 +12,60 @@ class PageFormConfigGenerator extends abstract_file_generator_1.AbstractFileGene
         const variable = externalParameter.value;
         const componentId = variable.componentCode;
         let generateString = "";
-        generateString += `
-import { ViewModelContext,  FormControl, Form, FormControlPropMeta, BindingType  } from '@farris/mobile-devkit';
+        generateString += `
+import { ViewModelContext,  FormControl, Form, FormControlPropMeta, BindingType  } from '@farris/mobile-devkit';
 import { DateConverter } from "@farris/mobile-vue-adapter";`;
         if (toolhepler_1.ToolHelper.isArray(variable.controls, false)) {
             generateString += this.generateConvertImport(variable);
         }
         generateString += this.getEol();
-        generateString += `
-
-export class ${page_form_manager_1.PageFormManager.generatePageFormName(componentId)} extends Form {
-  constructor(viewModelContext: ViewModelContext) {
-    super(viewModelContext);
+        generateString += `
+
+export class ${page_form_manager_1.PageFormManager.generatePageFormName(componentId)} extends Form {
+  constructor(viewModelContext: ViewModelContext) {
+    super(viewModelContext);
   }`;
-        generateString += `
-  @FormControlPropMeta({
-    bindingType: BindingType.UIState,
-    bindingPath: 'searchState/keyword',
-  })
-  searchState_keyword: FormControl;
-  @FormControlPropMeta({
-    bindingType: BindingType.UIState,
-    bindingPath: 'listaviewState/refreshLoading',
-  })
-  listaviewState_refreshLoading: FormControl;
+        generateString += `
+  @FormControlPropMeta({
+    bindingType: BindingType.UIState,
+    bindingPath: 'searchState/keyword',
+  })
+  searchState_keyword: FormControl;
+  @FormControlPropMeta({
+    bindingType: BindingType.UIState,
+    bindingPath: 'listaviewState/refreshLoading',
+  })
+  listaviewState_refreshLoading: FormControl;
 `;
         if (toolhepler_1.ToolHelper.isArray(variable.controls, false)) {
             variable.controls.forEach((ctl) => {
                 if (ctl.type == 'FormContrl') {
-                    generateString += `
+                    generateString += `
   @FormControlPropMeta({`;
-                    generateString += `
+                    generateString += `
       bindingType: BindingType.${ctl.bindingType},`;
                     if (ctl.binding) {
-                        generateString += `
+                        generateString += `
       bindingPath: '${ctl.binding}'` + ",";
                     }
                     if (ctl.valueChanged) {
-                        generateString += `
+                        generateString += `
       valueChanged: '${ctl.valueChanged}'` + ",";
                     }
                     if (ctl.converter) {
-                        generateString += `
+                        generateString += `
       valueConverter: ${ctl.converter}` + ",";
                     }
-                    generateString += `
-      ${this.genValidRules(ctl.validRules)}
+                    generateString += `
+      ${this.genValidRules(ctl.validRules)}
     })`;
-                    generateString += `
+                    generateString += `
     ${ctl.name}: FormControl;`;
                     generateString += this.getEol();
                 }
             });
         }
-        generateString += `
+        generateString += `
 }`;
         this.createFile(context.basePath, context.fileName, generateString);
         return response;
@@ -85,7 +85,7 @@ export class ${page_form_manager_1.PageFormManager.generatePageFormName(componen
             });
         }
         if (toolhepler_1.ToolHelper.isArray(arrCanImportConverter, false)) {
-            generateString += `
+            generateString += `
 import { ${arrCanImportConverter.join(", ")} } from "@farris/kendo-binding";`;
         }
         return generateString;

package/lib/mobileapp/vue/code-generator/file-generator/page-generator/page-handler-generator.js

@@ -11,72 +11,72 @@ class PageHandlerGenerator extends abstract_file_generator_1.AbstractFileGenerat
         const externalParameter = context.externalParameter;
         const variable = externalParameter.value;
         let generateString = "";
-        generateString += `
-import { CommandHandler, CommandHandlerMeta, CommandContext } from '@farris/mobile-devkit';
-import { StateMachineService } from '@farris/mobile-command-services';
+        generateString += `
+import { CommandHandler, CommandHandlerMeta, CommandContext } from '@farris/mobile-devkit';
+import { StateMachineService } from '@farris/mobile-command-services';
 import { CreateDataService } from '@farris/mobile-command-services';`;
         generateString += this.getEol();
         if (toolhepler_1.ToolHelper.isArray(variable.services, false)) {
             variable.services.forEach((service) => {
                 if (service.isCommon == "1" || service.isCommon == 1) {
-                    generateString += `
+                    generateString += `
 import { ${service.name} as ${service.alias} } from '${service.path}';`;
                 }
                 else {
-                    generateString += `
+                    generateString += `
 import { ${service.name} as ${service.alias} } from '../../../services/${service.fileName.toLowerCase()}';`;
                 }
             });
         }
         generateString += this.getEol();
-        generateString += `
-@CommandHandlerMeta({
-    commandName: '${variable.code}'
-})
+        generateString += `
+@CommandHandlerMeta({
+    commandName: '${variable.code}'
+})
 export class ${page_command_handler_manager_1.PageCommandHandlerManager.generateCommandHandlerName(variable.code)} extends CommandHandler {`;
-        generateString += `
+        generateString += `
     constructor(`;
         if (toolhepler_1.ToolHelper.isArray(variable.services, false)) {
             variable.services.forEach((service, index) => {
-                generateString += `
+                generateString += `
         public _${service.alias}: ${service.alias}`;
                 if (index < (variable.services.length - 1)) {
                     generateString += `,`;
                 }
             });
         }
-        generateString += `
-    ) {
-        super();
+        generateString += `
+    ) {
+        super();
     }`;
         generateString += this.getEol();
-        generateString += `
+        generateString += `
     schedule() {`;
         if (toolhepler_1.ToolHelper.isArray(variable.handlers, false)) {
             variable.handlers.forEach((task, index) => {
                 if (task.type == "executeNode") {
-                    generateString += `
+                    generateString += `
         this.addTask('${task.code}', (context: CommandContext) => {`;
                     if (toolhepler_1.ToolHelper.isArray(task.params, false)) {
-                        generateString += `
+                        generateString += `
             const args = [`;
                         task.params.forEach((param, index) => {
-                            generateString += `
+                            generateString += `
                 ${(param.value && param.value.toLowerCase() != "null") ? "'" + param.value + "'" : "''"}`;
                             if (index < (task.params.length - 1)) {
                                 generateString += `, `;
                             }
                         });
-                        generateString += `
+                        generateString += `
                     ];`;
                     }
                     else {
-                        generateString += `
+                        generateString += `
             const args = [];`;
                     }
-                    generateString += `
+                    generateString += `
             return this.invoke(this._${task.serviceName}, '${task.method}', args, context);`;
-                    generateString += `
+                    generateString += `
         });`;
                     generateString += this.getEol();
                 }
@@ -84,13 +84,13 @@ export class ${page_command_handler_manager_1.PageCommandHandlerManager.generate
         }
         if (toolhepler_1.ToolHelper.isArray(variable.links, false)) {
             variable.links.forEach((link, index) => {
-                generateString += `
+                generateString += `
         this.addLink('${link.from}', '${link.to}', \`${link.condition}\`);`;
             });
         }
-        generateString += `
+        generateString += `
     }`;
-        generateString += `
+        generateString += `
 }`;
         this.createFile(context.basePath, context.fileName, generateString);
         return response;

package/lib/mobileapp/vue/code-generator/file-generator/page-generator/page-provider-generator.js

@@ -20,97 +20,97 @@ class PageProviderGenerator extends abstract_file_generator_1.AbstractFileGenera
         const lowerCaseComponentId = componentId.toLowerCase();
         const serviceRefs = vueViewModel.serviceRefs.filter(item => item.isCommon ? false : true);
         let generateString = "";
-        generateString += `
-import {
-    StaticProvider, Injector, Repository,
-    ViewModel, BindingData, UIState, StateMachine, Form, ViewModelContext, COMMAND_HANDLERS_TOKEN
-} from '@farris/mobile-devkit';
-import { BEF_VIEWMODEL_PROVIDERS } from '@farris/mobile-bef';
-import {
-    LoadDataService,
-    RemoveDataService,
-    RouterService,
-    CreateDataService,
-    COMMAND_SERVICES_VIEWMODEL_PROVIDERS,
-    CommandService,SaveDataService,
-    CancelDataService,
-    ApproveService,
-    StateMachineService,
-    AttachmentService,
-    EditDataService,
-    UpdateDataService,
-    CcWorkService,
-    ValidatorServices,
-    BusinessAttachmentService,
-    CheckDataService,
-    DiscussionGroupService,
-    DialogService,
-    LoadingService,
-    NotifyService,
-    ToastService,
-    JsBridgeService,
-    VoVariableService,
-    UIDataService
-} from '@farris/mobile-command-services';
-import { ModelRepository } from '../../models/model.repository'
-${serviceRefs.map(item => 'import { ' + item.name + ' as ' + item.alias + ' } from "../../services/' + item.fileName.toLowerCase() + '";').join('')}
+        generateString += `
+import {
+    StaticProvider, Injector, Repository,
+    ViewModel, BindingData, UIState, StateMachine, Form, ViewModelContext, COMMAND_HANDLERS_TOKEN
+} from '@farris/mobile-devkit';
+import { BEF_VIEWMODEL_PROVIDERS } from '@farris/mobile-bef';
+import {
+    LoadDataService,
+    RemoveDataService,
+    RouterService,
+    CreateDataService,
+    COMMAND_SERVICES_VIEWMODEL_PROVIDERS,
+    CommandService,SaveDataService,
+    CancelDataService,
+    ApproveService,
+    StateMachineService,
+    AttachmentService,
+    EditDataService,
+    UpdateDataService,
+    CcWorkService,
+    ValidatorServices,
+    BusinessAttachmentService,
+    CheckDataService,
+    DiscussionGroupService,
+    DialogService,
+    LoadingService,
+    NotifyService,
+    ToastService,
+    JsBridgeService,
+    VoVariableService,
+    UIDataService
+} from '@farris/mobile-command-services';
+import { ModelRepository } from '../../models/model.repository'
+${serviceRefs.map(item => 'import { ' + item.name + ' as ' + item.alias + ' } from "../../services/' + item.fileName.toLowerCase() + '";').join('')}
 `;
         if (vueViewModel.form) {
-            generateString += `
+            generateString += `
 import { ${page_form_manager_1.PageFormManager.generatePageFormName(componentId)} } from "./${lowerCaseComponentId}.form";`;
         }
         if (vueViewModel.states) {
-            generateString += `
+            generateString += `
 import { ${page_uistate_manager_1.PageUIStateManager.generateUIStateName(componentId)} } from "./${lowerCaseComponentId}.uistate";`;
         }
         if (vueViewModel.stateMachine) {
-            generateString += `
+            generateString += `
 import { ${page_statemachine_manager_1.PageStateMachineManager.generateStateMachineName(componentId)} } from "./${lowerCaseComponentId}.statemachine";`;
         }
-        generateString += `
+        generateString += `
 import { ${page_viewmodel_manager_1.PageViewModelManager.generateViewModelName(componentId)} } from "./${lowerCaseComponentId}.viewmodel";`;
         if (utility_1.ToolHelper.isArray(vueViewModel.commands, false)) {
             vueViewModel.commands.forEach((item) => {
-                generateString += `
+                generateString += `
 import { ${page_command_handler_manager_1.PageCommandHandlerManager.generateCommandHandlerName(item.code)} } from "./handlers/${item.code.toLowerCase()}.handler";`;
             });
         }
-        generateString += `
+        generateString += `
 import {${page_binding_data_manager_1.PageBindingDataManager.generateBindingName(componentId)}} from "./${lowerCaseComponentId}.bindingdata";`;
-        generateString += `
-
+        generateString += `
+
 export const ${providerName}: StaticProvider[] = [`;
-        generateString += `
+        generateString += `
     { provide: Repository, useExisting: ModelRepository, deps: []},`;
-        generateString += `
+        generateString += `
     { provide: BindingData, useClass: ${page_binding_data_manager_1.PageBindingDataManager.generateBindingName(componentId)}, deps: []},`;
         if (vueViewModel.states) {
-            generateString += `
+            generateString += `
     { provide: UIState, useClass: ${page_uistate_manager_1.PageUIStateManager.generateUIStateName(componentId)}, deps: []},`;
         }
         if (vueViewModel.stateMachine) {
-            generateString += `
+            generateString += `
     { provide: StateMachine, useClass: ${page_statemachine_manager_1.PageStateMachineManager.generateStateMachineName(componentId)}, deps: []},`;
         }
         if (vueViewModel.form) {
-            generateString += `
+            generateString += `
     { provide: Form, useClass: ${page_form_manager_1.PageFormManager.generatePageFormName(componentId)}, deps: [ViewModelContext ] },`;
         }
-        generateString += `
+        generateString += `
     { provide: ViewModel, useClass: ${page_viewmodel_manager_1.PageViewModelManager.generateViewModelName(componentId)}, deps: [Injector] },`;
         if (utility_1.ToolHelper.isArray(vueViewModel.commands, false)) {
             vueViewModel.commands.forEach((itemCommand) => {
-                generateString += `
+                generateString += `
     { provide: COMMAND_HANDLERS_TOKEN, useClass: ${page_command_handler_manager_1.PageCommandHandlerManager.generateCommandHandlerName(itemCommand.code)}, deps: [${this.generateHandlerService(itemCommand, serviceRefs)}], multi: true},`;
             });
         }
         if (utility_1.ToolHelper.isArray(serviceRefs, false)) {
             serviceRefs.forEach((service) => {
-                generateString += `
+                generateString += `
     { provide: ${service.alias}, useClass: ${service.alias}, deps: [ViewModelContext]},`;
             });
         }
-        generateString += `
+        generateString += `
 ].concat(COMMAND_SERVICES_VIEWMODEL_PROVIDERS).concat(BEF_VIEWMODEL_PROVIDERS);`;
         this.createFile(context.basePath, context.fileName, generateString);
         return response;

package/lib/mobileapp/vue/code-generator/file-generator/page-generator/page-statemachine-generator.js

@@ -12,58 +12,58 @@ class PageStateMachineGenerator extends abstract_file_generator_1.AbstractFileGe
         const variable = externalParameter.value;
         let generateString = "";
         const eol = this.getEol();
-        generateString += `
-import { StateMachine, State, StatePropMeta, RenderState, RenderStatePropMeta, Action, ActionMethodMeta } from '@farris/mobile-devkit';
+        generateString += `
+import { StateMachine, State, StatePropMeta, RenderState, RenderStatePropMeta, Action, ActionMethodMeta } from '@farris/mobile-devkit';
 `;
-        generateString += `
-export class  ${page_statemachine_manager_1.PageStateMachineManager.generateStateMachineName(variable.componentId)} extends StateMachine {
+        generateString += `
+export class  ${page_statemachine_manager_1.PageStateMachineManager.generateStateMachineName(variable.componentId)} extends StateMachine {
 `;
         if (toolhepler_1.ToolHelper.isArray(variable.ngStates, false)) {
             variable.ngStates.forEach((ngState) => {
                 if (ngState.initialState) {
-                    generateString += `
-    @StatePropMeta({
-        initialState: true
+                    generateString += `
+    @StatePropMeta({
+        initialState: true
     })`;
                 }
                 else {
-                    generateString += `
+                    generateString += `
     @StatePropMeta()`;
                 }
-                generateString += `
+                generateString += `
     ${ngState.name}: State;`;
                 generateString += eol;
             });
         }
         if (toolhepler_1.ToolHelper.isArray(variable.ngRenderStates, false)) {
             variable.ngRenderStates.forEach((ngRenderState) => {
-                generateString += `
-    @RenderStatePropMeta({
-        render: ${ngRenderState.render}
-    })
+                generateString += `
+    @RenderStatePropMeta({
+        render: ${ngRenderState.render}
+    })
     ${ngRenderState.name}: RenderState;`;
                 generateString += this.getEol();
             });
         }
         if (toolhepler_1.ToolHelper.isArray(variable.ngActions, false)) {
             variable.ngActions.forEach((ngAction) => {
-                generateString += `
+                generateString += `
     @ActionMethodMeta({`;
                 if (ngAction.precondition) {
-                    generateString += `
+                    generateString += `
         precondition: ${ngAction.precondition},`;
                 }
                 if (ngAction.transitTo) {
-                    generateString += `
+                    generateString += `
         transitTo: '${ngAction.transitTo}'`;
                 }
-                generateString += `
-    })
+                generateString += `
+    })
     ${ngAction.name}: Action;`;
                 generateString += this.getEol();
             });
         }
-        generateString += `
+        generateString += `
 }`;
         this.createFile(context.basePath, context.fileName, generateString);
         return response;

package/lib/mobileapp/vue/code-generator/file-generator/page-generator/page-uistate-generator.js

@@ -5,54 +5,108 @@ const abstract_file_generator_1 = require("../abstract-file-generator");
 const file_generator_response_1 = require("../file-generator-response");
 const toolhepler_1 = require("../../../../../utility/toolhepler");
 const page_uistate_manager_1 = require("../../page-manager/page-uistate-manager");
+const vue_state_1 = require("../../../domstructure/ui/common/vue-state");
+const lodash_1 = require("lodash");
 class PageUIStateGenerator extends abstract_file_generator_1.AbstractFileGenerator {
     generate(context) {
         const response = file_generator_response_1.FileGeneratorResponse.getNewEmptyInstance();
         const vueStates = context.externalParameter;
-        let generateString = `
-import { UIState, UIStatePropMeta } from '@farris/mobile-devkit';
-
-/**
- * 表单UIState
- */
+        let generateString = `
+import { UIState, UIStatePropMeta, ControlStatePropMeta } from '@farris/mobile-devkit';
+
+/**
+ * 表单UIState
+ */
 export class ${page_uistate_manager_1.PageUIStateManager.generateUIStateName(vueStates.componentId)} extends  UIState {`;
-        generateString += `
-
-    @UIStatePropMeta({
-        stateName: 'listaviewState'
-    })
-    public listaviewState: any = { refreshLoading: false, loadMoreLoading: false, loadMoreFinished: false };
-    @UIStatePropMeta({
-        stateName: 'searchState'
-    })
-    public searchState: any = { keyword: '' };
-    @UIStatePropMeta({
-        stateName: 'filterState'
-    })
-    public filterState : any = { filters: '' };
-    @UIStatePropMeta({
-        stateName: 'tabState'
-    })
+        generateString += `
+
+    @UIStatePropMeta({
+        stateName: 'listaviewState'
+    })
+    public listaviewState: any = { refreshLoading: false, loadMoreLoading: false, loadMoreFinished: false };
+    @UIStatePropMeta({
+        stateName: 'searchState'
+    })
+    public searchState: any = { keyword: '' };
+    @UIStatePropMeta({
+        stateName: 'filterState'
+    })
+    public filterState : any = { filters: '' };
+    @UIStatePropMeta({
+        stateName: 'tabState'
+    })
     public tabState: any = { currentTab: '' };`;
         if (toolhepler_1.ToolHelper.isArray(vueStates.stateList, false)) {
             generateString += this.getEol();
             vueStates.stateList.forEach((s, index) => {
-                generateString += `
-    @UIStatePropMeta({
-        stateName: '${s.code}'
+                if (s.category.includes('control')) {
+                    return;
+                }
+                generateString += `
+    @UIStatePropMeta({
+        stateName: '${s.code}'
+    })`;
+                if (s.value) {
+                    generateString += `
+    public ${s.code}: ${s.type} = ${s.value};`;
+                }
+                else {
+                    generateString += `
+    public ${s.code}: ${s.type};`;
+                }
+                generateString += this.getEol();
+            });
+        }
+        if (toolhepler_1.ToolHelper.isArray(vueStates.stateList, false)) {
+            generateString += this.getEol();
+            vueStates.stateList.forEach((s, index) => {
+                if (!s.category.includes('control')) {
+                    return;
+                }
+                generateString += `
+    @ControlStatePropMeta({
+        stateName: '${s.code}',
+        controlInfo: ${JSON.stringify(s.controlInfo)},
+        `;
+                generateString +=
+                    `originalValue: {
+        `;
+                if (s.originalValue) {
+                    Object.keys(s.originalValue).forEach((property) => {
+                        let value = lodash_1.cloneDeep(s.originalValue[property]);
+                        let type = 'constant';
+                        if (s.originalValue[property] instanceof vue_state_1.VueState) {
+                            type = lodash_1.cloneDeep(s.originalValue[property].type);
+                            value = lodash_1.cloneDeep(s.originalValue[property].value);
+                        }
+                        if (!type) {
+                            if (typeof value === 'boolean') {
+                                type = 'constant';
+                            }
+                            else {
+                                type = 'variable';
+                            }
+                        }
+                        generateString +=
+                            `    ${property}:{ type: '${type}', value: ${JSON.stringify(value)} },
+        `;
+                    });
+                }
+                generateString +=
+                    `}
     })`;
                 if (s.value) {
-                    generateString += `
+                    generateString += `
     public ${s.code}: ${s.type} = ${s.value};`;
                 }
                 else {
-                    generateString += `
+                    generateString += `
     public ${s.code}: ${s.type};`;
                 }
                 generateString += this.getEol();
             });
         }
-        generateString += `}
+        generateString += `}
 `;
         this.createFile(context.basePath, context.fileName, generateString);
         return response;

package/lib/mobileapp/vue/code-generator/file-generator/page-generator/page-uistate-generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"page-uistate-generator.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/page-generator/page-uistate-generator.ts"],"names":[],"mappings":";;;AAAA,wEAAmE;AAGnE,wEAAmE;AAEnE,kEAA+D;AAC/D,kFAA6E;AAW7E,MAAa,oBAAqB,SAAQ,+CAAqB;IAC3D,QAAQ,CAAC,OAA6B;QAClC,MAAM,QAAQ,GAA0B,+CAAqB,CAAC,mBAAmB,EAAE,CAAC;QACpF,MAAM,SAAS,GAAc,OAAO,CAAC,iBAAiB,CAAC;QACvD,IAAI,cAAc,GACd;;;;;;eAMG,yCAAkB,CAAC,mBAAmB,CAAC,SAAS,CAAC,WAAW,CAAC,qBAAqB,CAAC;QAC9F,cAAc,IAAI;;;;;;;;;;;;;;;;;+CAiByB,CAAA;QAevC,IAAI,uBAAU,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE;YAChD,cAAc,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAM,EAAE,KAAa,EAAE,EAAE;gBAIlD,cAAc,IAAI;;sBAEZ,CAAC,CAAC,IAAI;OACrB,CAAA;gBACS,IAAI,CAAC,CAAC,KAAK,EAAE;oBACT,cAAc,IAAI;aACzB,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,KAAK,GAAG,CAAC;iBAC9B;qBAAM;oBACH,cAAc,IAAI;aACzB,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,GAAG,CAAC;iBACjB;gBACD,cAAc,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAEpC,CAAC,CAAC,CAAC;SACN;QAED,cAAc,IAAI;CACzB,CAAC;QAEM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QAEpE,OAAO,QAAQ,CAAC;IACpB,CAAC;CAEJ;AA1ED,oDA0EC"}
+{"version":3,"file":"page-uistate-generator.js","sourceRoot":"","sources":["../../../../../../src/mobileapp/vue/code-generator/file-generator/page-generator/page-uistate-generator.ts"],"names":[],"mappings":"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"}