@magic-xpa/cli 4.1100.0-dev4110.24 → 4.1100.0-dev4110.240

package/src/types/interfaces/app.js

@@ -1,10 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RouteTable = exports.Route = void 0;
-class Route {
-}
-exports.Route = Route;
-class RouteTable {
-}
-exports.RouteTable = RouteTable;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RouteTable = exports.Route = void 0;
+class Route {
+}
+exports.Route = Route;
+class RouteTable {
+}
+exports.RouteTable = RouteTable;
 //# sourceMappingURL=app.js.map

package/src/types/interfaces/control.d.ts

@@ -1,82 +1,82 @@
-import { HorizontalAlignments } from '../enums/horizontal-alignments.enum';
-import { CtrlImageStyle, MgControlType, SideType, StorageAttributeType, TableWebStyle, RowEditingTypes, WindowType } from "../enums/Enums";
-import { CtrlButtonTypeGui } from '../enums/Enums';
-export interface Exp {
-    has_exp?: boolean;
-}
-export interface Boolean_Exp extends Exp {
-    value?: boolean;
-}
-export interface Number_Exp extends Exp {
-    value?: number;
-}
-export interface String_Exp extends Exp {
-    value?: string;
-}
-export interface Control {
-    controlType: MgControlType;
-    classes?: string;
-    hasClassExpression?: boolean;
-    style: {
-        font?: Number_Exp;
-        color?: Number_Exp;
-        border?: Boolean_Exp;
-        border_style?: Number_Exp;
-        focus_color?: Number_Exp;
-        alignment: {
-            horizontal?: HorizontalAlignments;
-            vertical?: number;
-        };
-        line_divider?: Boolean_Exp;
-        multiline_edit?: boolean;
-    };
-    props: {
-        id: string;
-        name?: string;
-        component_uniquename?: string;
-        component_path?: string;
-        visible?: Exp;
-        enabled?: Exp;
-        tab_order?: Number_Exp;
-        password_edit?: Boolean_Exp;
-        button_style?: CtrlButtonTypeGui;
-        is_table_child?: boolean;
-        table_row_height?: number;
-        table_title_height?: number;
-        scroll_bar?: boolean;
-        no_modifiable_descendants?: boolean;
-        modifiable?: Boolean_Exp;
-        layer?: number;
-        tab_control_side?: SideType;
-        attribute?: StorageAttributeType;
-        web_style?: TableWebStyle;
-        row_editing_type?: RowEditingTypes;
-        mgformat?: string;
-        currency?: string;
-        mask?: string;
-        directive?: string;
-        validator?: string;
-        formatter?: string;
-        window_type?: WindowType;
-        is_router_outlet?: boolean;
-        default_outlet?: boolean;
-        wallpaper?: string;
-        wallpaper_style?: CtrlImageStyle;
-        sortable?: boolean;
-        common_line_id?: number;
-        dataexp?: boolean;
-        showsecs?: boolean;
-        enum_id: string;
-        directive_id: string;
-    };
-    hint: {
-        text?: String_Exp;
-    };
-    coordinates: {
-        x?: number;
-        y?: number;
-        width: number;
-        height?: number;
-    };
-    children: null | Control[];
-}
+import { HorizontalAlignments } from '../enums/horizontal-alignments.enum';
+import { CtrlImageStyle, MgControlType, SideType, StorageAttributeType, TableWebStyle, RowEditingTypes, WindowType } from "../enums/Enums";
+import { CtrlButtonTypeGui } from '../enums/Enums';
+export interface Exp {
+    has_exp?: boolean;
+}
+export interface Boolean_Exp extends Exp {
+    value?: boolean;
+}
+export interface Number_Exp extends Exp {
+    value?: number;
+}
+export interface String_Exp extends Exp {
+    value?: string;
+}
+export interface Control {
+    controlType: MgControlType;
+    classes?: string;
+    hasClassExpression?: boolean;
+    style: {
+        font?: Number_Exp;
+        color?: Number_Exp;
+        border?: Boolean_Exp;
+        border_style?: Number_Exp;
+        focus_color?: Number_Exp;
+        alignment: {
+            horizontal?: HorizontalAlignments;
+            vertical?: number;
+        };
+        line_divider?: Boolean_Exp;
+        multiline_edit?: boolean;
+    };
+    props: {
+        id: string;
+        name?: string;
+        component_uniquename?: string;
+        component_path?: string;
+        visible?: Exp;
+        enabled?: Exp;
+        tab_order?: Number_Exp;
+        password_edit?: Boolean_Exp;
+        button_style?: CtrlButtonTypeGui;
+        is_table_child?: boolean;
+        table_row_height?: number;
+        table_title_height?: number;
+        scroll_bar?: boolean;
+        no_modifiable_descendants?: boolean;
+        modifiable?: Boolean_Exp;
+        layer?: number;
+        tab_control_side?: SideType;
+        attribute?: StorageAttributeType;
+        web_style?: TableWebStyle;
+        row_editing_type?: RowEditingTypes;
+        mgformat?: string;
+        currency?: string;
+        mask?: string;
+        directive?: string;
+        validator?: string;
+        formatter?: string;
+        window_type?: WindowType;
+        is_router_outlet?: boolean;
+        default_outlet?: boolean;
+        wallpaper?: string;
+        wallpaper_style?: CtrlImageStyle;
+        sortable?: boolean;
+        common_line_id?: number;
+        dataexp?: boolean;
+        showsecs?: boolean;
+        enum_id: string;
+        directive_id: string;
+    };
+    hint: {
+        text?: String_Exp;
+    };
+    coordinates: {
+        x?: number;
+        y?: number;
+        width: number;
+        height?: number;
+    };
+    children: null | Control[];
+}

package/src/types/interfaces/control.js

@@ -1,3 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=control.js.map

package/src/types/interfaces/env.interface.d.ts

@@ -1,19 +1,19 @@
-import { MagicMetadata, MagicPaths } from "../../schematics/magic-utils/metadata.class";
-import { AppJson } from "../index";
-import { Project, Workspace } from "../../schematics/utils/devkit-utils/config";
-export declare class ModuleInfo {
-    moduleName: string;
-    loadOnDemand: boolean;
-    constructor(moduleName: string, loadOnDemand: boolean);
-}
-export interface IEnv {
-    workspace: Workspace;
-    project: Project;
-    metadata: MagicMetadata;
-    programList: MagicMetadata;
-    componentsGen: string[];
-    modulesGen: ModuleInfo[];
-    app: AppJson;
-    paths?: MagicPaths;
-    prevent_log: boolean;
-}
+import { MagicMetadata, MagicPaths } from "../../schematics/magic-utils/metadata.class";
+import { AppJson } from "../index";
+import { Project, Workspace } from "../../schematics/utils/devkit-utils/config";
+export declare class ModuleInfo {
+    moduleName: string;
+    loadOnDemand: boolean;
+    constructor(moduleName: string, loadOnDemand: boolean);
+}
+export interface IEnv {
+    workspace: Workspace;
+    project: Project;
+    metadata: MagicMetadata;
+    programList: MagicMetadata;
+    componentsGen: string[];
+    modulesGen: ModuleInfo[];
+    app: AppJson;
+    paths?: MagicPaths;
+    prevent_log: boolean;
+}

package/src/types/interfaces/env.interface.js

@@ -1,11 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModuleInfo = void 0;
-class ModuleInfo {
-    constructor(moduleName, loadOnDemand) {
-        this.moduleName = moduleName;
-        this.loadOnDemand = loadOnDemand;
-    }
-}
-exports.ModuleInfo = ModuleInfo;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModuleInfo = void 0;
+class ModuleInfo {
+    constructor(moduleName, loadOnDemand) {
+        this.moduleName = moduleName;
+        this.loadOnDemand = loadOnDemand;
+    }
+}
+exports.ModuleInfo = ModuleInfo;
 //# sourceMappingURL=env.interface.js.map

package/src/types/interfaces/template.config.d.ts

@@ -1,8 +1,8 @@
-import { GeneratedFileTypes } from '../enums/generated-file-types.enum';
-export interface TemplateConfig {
-    template: string;
-    name: string;
-    destination: string;
-    type: GeneratedFileTypes;
-    data: object;
-}
+import { GeneratedFileTypes } from '../enums/generated-file-types.enum';
+export interface TemplateConfig {
+    template: string;
+    name: string;
+    destination: string;
+    type: GeneratedFileTypes;
+    data: object;
+}

package/src/types/interfaces/template.config.js

@@ -1,3 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=template.config.js.map

package/templates/component/view.component.ts

@@ -1,7 +1,8 @@
 <%
 var
    id = ctrl.props.id,
-   selector = app.suffix + '-' + id,
+   uniqueComponent = ctrl.props.component_uniquename,
+   selector = app.suffix + '-' + uniqueComponent,
    useMatGrid  = false;
    isModal = (ctrl.props.window_type && ctrl.props.window_type == WindowType.Overlay);
 %>

package/templates/themes/basicHTML/checkbox.ejs

@@ -22,7 +22,7 @@
       <%if(ctrl.props.text.has_exp) { %>
       {{mg.getText(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)}}
       <% } else {%>
-      <%=ctrl.props.text%>
+        <%- ctrl.props.text.replace(/@/g, '&#64;') %>
       <%}%>
       <% } %>
     </label>

package/templates/themes/basicHTML/edit.ejs

@@ -44,7 +44,8 @@
                         <%- include('../../attributes/common/input_attributes', {ctrl : ctrl}) %>
                         <% if (ctrl.props.mgformat) { %><%- ctrl.props.mgformat %> <%}%>
                         <% if (ctrl.props.mask) { %>
-                           [mask]="mg.getAlphaMask(<%- ctrl.props.enum_id %>) [showMaskTyped]='true'"
+                           [mask]="mg.getAlphaMask(<%- ctrl.props.enum_id %>)"
+                           [showMaskTyped]='true'
                         <% } %>
                         <% if (ctrl.props.must_input && !ctrl.props.must_input.has_exp) { %> required <%}%>
                         <% if (ctrl.props.directive) { %><%- ctrl.props.directive %><%}%>

package/templates/themes/basicHTML/label.ejs

@@ -5,7 +5,7 @@
     <%if(ctrl.props.text.has_exp || ctrl.style && ctrl.style.multiline_edit) { %>
         {{mg.getText(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)}}
     <% } else {%>
-        <%=ctrl.props.text%>
+        <%- ctrl.props.text.replace(/@/g, '&#64;') %>
     <%}%>
 <% } %>
 </label>

package/templates/themes/material/checkbox.ejs

@@ -13,7 +13,7 @@
         <%if(ctrl.props.text.has_exp || ctrl.style && ctrl.style.multiline_edit) { %>
             {{mg.getText(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)}}
         <% } else {%>
-            <%=ctrl.props.text%>
+            <%- ctrl.props.text.replace(/@/g, '&#64;') %>
         <%}%>
     <% }%>
 

package/templates/themes/material/listbox.ejs

@@ -7,7 +7,6 @@
         <%- include('../../attributes/common//input_attributes', {ctrl : ctrl}) %>
         <% if (ctrl.props.must_input && !ctrl.props.must_input.has_exp) { %> required <%}%>
         <%- include('../../attributes/common/base/enabled', {ctrl : ctrl}) %>
-        [tabIndex]="screenFormGroup.get(<%- ctrl.props.enum_id %>)!.disabled ? -1 : 0"
 >
     <%# build of items in listbox %>
     <mat-list-option

package/templates/themes/table/HTMLTable/columnHeader.ejs

@@ -5,7 +5,9 @@
         <%if(ctrl.props.column_title && ctrl.props.column_title.has_exp) { %>
             {{mg.getText(<%= ctrl.props.enum_id %>)}}
         <% } else {%>
-            <%=ctrl.props.column_title%>
+            <% if (ctrl.props.column_title) { %>
+                <%- ctrl.props.column_title.replace(/@/g, '&#64;') %>
+            <% } %>
         <%}%>
     </label>
 </th>

package/templates/themes/table/grid/column.ejs

@@ -8,7 +8,9 @@
             > <%if(ctrl.props.column_title && ctrl.props.column_title.has_exp) { %>
             {{mg.getText(<%- ctrl.props.enum_id %>)}}
         <% } else {%>
-        <%=ctrl.props.column_title%>
+            <% if (ctrl.props.column_title) { %>
+                <%- ctrl.props.column_title.replace(/@/g, '&#64;') %>
+            <% } %>
         <%}%> </mat-header-cell>
     <mat-cell *matCellDef="let row" <%- include('../../../attributes/common/base/visible', {ctrl : ctrl}) %> magicMark="magicTableRowContainer"
             <% if(magicConfig.allow_testing) { %>