@lcap/nasl 1.0.0-alpha.2 → 1.0.0-alpha.3

package/src/templator/genCurdMultipleKeyBlock.ts

@@ -39,7 +39,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
                 const relationEntity = parentNode?.findEntityByName(property.relationEntity);
                 if (relationEntity) {
                     const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
-                    const displayedProperty = getFirstDisplayedProperty(relationEntity, 'inFilter');
+                    const displayedProperty = getFirstDisplayedProperty(relationEntity);
                     if (displayedProperty) {
                         const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                         const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
@@ -132,7 +132,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
                 const relationEntity = parentNode?.findEntityByName(property.relationEntity);
                 if (relationEntity) {
                     const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
-                    const displayedProperty = getFirstDisplayedProperty(relationEntity, 'inForm');
+                    const displayedProperty = getFirstDisplayedProperty(relationEntity);
                     if (displayedProperty) {
                         const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                         const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
@@ -511,7 +511,7 @@ export function genCurdMultipleKeyBlock(entity: Entity, view: View) {
             "concept": "BindEvent",
             "arguments": [],
             "name": "created",
-            "calleeNamespace": "${view.getNamespace()}.views.View_${view.name}.logics",
+            "calleeNamespace": "${view.getNamespace()}.views.${view.name}.logics",
             "calleeName": "${nameGroup.viewLogicInit}"
         }
     ],
@@ -633,7 +633,7 @@ export function genGridViewMultipleKeyBlock(entity: Entity, view: View) {
             "concept": "BindEvent",
             "arguments": [],
             "name": "created",
-            "calleeNamespace": "${view.getNamespace()}.views.View_${view.name}.logics",
+            "calleeNamespace": "${view.getNamespace()}.views.${view.name}.logics",
             "calleeName": "${nameGroup.viewLogicInit}"
         }
     ],

package/src/templator/genEditTableBlock.ts

@@ -22,7 +22,7 @@ export function genEditTableColumnTemplate(entity: Entity, property: EntityPrope
 
     const expression = getExpression(property, `scope.item.${lowerEntityName}.${property.name}`);
 
-    const canEditable = (property: EntityProperty) => property.editable;
+    const canEditable = (property: EntityProperty) => !property.readonly;
 
     const getText = (property: EntityProperty) => {
         const propertyTypeName = property.typeAnnotation.typeName;
@@ -37,7 +37,7 @@ export function genEditTableColumnTemplate(entity: Entity, property: EntityPrope
     };
 
     const genEditComponent = (property: EntityProperty) => {
-        if (!property.editable)
+        if (property.readonly)
             return '';
         const label = property.label || property.name;
         let formItem = '';
@@ -48,7 +48,7 @@ export function genEditTableColumnTemplate(entity: Entity, property: EntityPrope
             const relationEntity = parentNode?.findEntityByName(property.relationEntity);
             if (relationEntity) {
                 const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
-                const displayedProperty = getFirstDisplayedProperty(relationEntity, 'inForm');
+                const displayedProperty = getFirstDisplayedProperty(relationEntity);
                 if (displayedProperty) {
                     const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                     const selectNameGroup = selectNameGroupMap.get(relationEntity.name);

package/src/templator/genGetBlock.ts

@@ -109,7 +109,7 @@ export function genGetBlock(entity: Entity, view: View) {
             "concept": "BindEvent",
             "arguments": [],
             "name": "created",
-            "calleeNamespace": "${view.getNamespace()}.views.View_${view.name}.logics",
+            "calleeNamespace": "${view.getNamespace()}.${view.name}.logics",
             "calleeName": "${nameGroup.viewLogicLoad}"
         }
     ]

package/src/templator/genListViewBlock.ts

@@ -77,7 +77,7 @@ export function genLoadListViewLogic(entity: Entity, nameGroup: NameGroup, newSt
                     calleeName: entityLogic.name,
                     arguments: [
                         genLogicParam(`${entityLogic.params[0].name}`, 'params.page'),
-                        genLogicParam(`${entityLogic.params[0].name}`, 'params.size'),
+                        genLogicParam(`${entityLogic.params[1].name}`, 'params.size'),
                     ],
                 }),
             }),
@@ -97,7 +97,7 @@ export function genListViewBlock(entity: Entity, view: View, property: EntityPro
     nameGroup.viewElementMainView = viewElementMainView;
     nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
 
-    const displayedProperty = property || getFirstDisplayedProperty(entity, 'inDetail');
+    const displayedProperty = property || getFirstDisplayedProperty(entity);
 
     const newStructures: Array<any> = [];
     const newLogics: Array<any> = [];

package/src/templator/genSelectBlock.ts

@@ -91,7 +91,7 @@ export function genSelectBlock(entity: Entity, view: View) {
     nameGroup.viewElementMainView = viewElementMainView;
     nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
 
-    const displayedProperty = getFirstDisplayedProperty(entity, 'inDetail');
+    const displayedProperty = getFirstDisplayedProperty(entity);
 
     const allEntities = [
         entity,

package/src/templator/genUpdateBlock.ts

@@ -1,14 +1,18 @@
 import { config } from '../config';
 import * as utils from '../utils';
 import { App, Namespace, Entity, Logic, View, Enum } from '../concepts';
+import { NaslCoreTypeAnnotation, NaslUITypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode } from './utils';
 import {
-    NaslCoreTypeAnnotation, NaslUITypeAnnotation, NaslTypeAnnotation,
-    NaslLogicItem, NaslNode,
-} from './utils';
-import {
-    NameGroup, filterProperty, getFirstDisplayedProperty, genUniqueQueryNameGroup,
-    genLogicParam, genCallComponentLogic, genLoadSelectLogic, genQueryStructure,
-    genQueryLogic, genEnumSelectBlock,
+    NameGroup,
+    filterProperty,
+    getFirstDisplayedProperty,
+    genUniqueQueryNameGroup,
+    genLogicParam,
+    genCallComponentLogic,
+    genLoadSelectLogic,
+    genQueryStructure,
+    genQueryLogic,
+    genEnumSelectBlock,
 } from '.';
 
 export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>) {
@@ -32,16 +36,13 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
             let formItem = `            <u-form-item label="${label}"${required ? ' required' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''}>\n`;
 
             const { typeAnnotation } = property || {};
-            const {
-                typeName: propertyTypeName,
-                typeNamespace: propertyTypeNamespace,
-            } = typeAnnotation || {};
+            const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
             if (property.relationEntity) {
                 // 有外键关联
                 const relationEntity = parentNode?.findEntityByName(property.relationEntity);
                 if (relationEntity) {
                     const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
-                    const displayedProperty = getFirstDisplayedProperty(relationEntity, 'inForm');
+                    const displayedProperty = getFirstDisplayedProperty(relationEntity);
                     if (displayedProperty) {
                         const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                         const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
@@ -109,16 +110,13 @@ export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, se
             let formItem = `            <van-field drole="other" label="${label}"${required ? ' required' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''}>\n`;
 
             const { typeAnnotation } = property || {};
-            const {
-                typeName: propertyTypeName,
-                typeNamespace: propertyTypeNamespace,
-            } = typeAnnotation || {};
+            const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
             if (property.relationEntity) {
                 // 有外键关联
                 const relationEntity = parentNode?.findEntityByName(property.relationEntity);
                 if (relationEntity) {
                     const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
-                    const displayedProperty = getFirstDisplayedProperty(relationEntity, 'inForm');
+                    const displayedProperty = getFirstDisplayedProperty(relationEntity);
                     if (displayedProperty) {
                         const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                         const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
@@ -173,9 +171,7 @@ export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, se
 }
 
 function genSubmitLogic(updateLogic: Logic, nameGroup: NameGroup) {
-    const params = [
-        genLogicParam(`${updateLogic.params[0].name}`, nameGroup.viewVariableEntity),
-    ];
+    const params = [genLogicParam(`${updateLogic.params[0].name}`, nameGroup.viewVariableEntity)];
     return NaslNode.Logic({
         name: nameGroup.viewLogicSubmit,
         params: [] as any,
@@ -212,7 +208,7 @@ function genSubmitLogic(updateLogic: Logic, nameGroup: NameGroup) {
                     NaslLogicItem.CallLogic({
                         label: '弹出消息',
                         shortcut: true,
-                        calleeNamespace: 'nasl.ui.logics',
+                        calleeNamespace: 'nasl.ui',
                         calleeName: 'showMessage',
                         arguments: [
                             NaslLogicItem.Argument({
@@ -232,9 +228,7 @@ function genSubmitLogic(updateLogic: Logic, nameGroup: NameGroup) {
 }
 
 function genLoadLogic(getLogic: Logic, nameGroup: NameGroup) {
-    const params = [
-        genLogicParam(`${getLogic.params[0].name}`, 'id'),
-    ];
+    const params = [genLogicParam(`${getLogic.params[0].name}`, 'id')];
     return NaslNode.Logic({
         name: nameGroup.viewLogicLoad,
         description: '',
@@ -330,7 +324,7 @@ export function genUpdateBlock(entity: Entity, view: View) {
             "concept": "BindEvent",
             "arguments": [],
             "name": "created",
-            "calleeNamespace": "${view.getNamespace()}.views.View_${view.name}.logics",
+            "calleeNamespace": "${view.getNamespace()}.views.${view.name}.logics",
             "calleeName": "${nameGroup.viewLogicLoad}"
         }
     ],

package/src/templator/utils.ts

@@ -15,10 +15,7 @@ export const filterProperty = (key: 'inTable' | 'inFilter' | 'inForm' | 'inDetai
  */
 export function getExpression(property: EntityProperty, expression: string) {
     const { typeAnnotation } = property || {};
-    const {
-        typeName: propertyTypeName,
-        typeNamespace: propertyTypeNamespace,
-    } = typeAnnotation || {};
+    const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
     if (propertyTypeName === 'DateTime')
         return `$utils['FormatDate'](${expression}, 'YYYY-MM-DD HH:mm:ss')`;
     else if (propertyTypeName === 'Date')
@@ -44,8 +41,8 @@ export function getParamFromLogic(logic: Logic, paramName: string) {
     return params.find((item) => item.name === paramName);
 }
 
-export function getFirstDisplayedProperty(entity: Entity, display: string = 'inTable') {
-    let property = entity.properties.find((property) => property.editable);
+export function getFirstDisplayedProperty(entity: Entity) {
+    let property = entity.properties.find((property) => !property.readonly);
     if (!property)
         property = entity.properties[0];
     return property;
@@ -60,7 +57,6 @@ function genArgumentMemberExpression(arr: string[]) {
             property: NaslLogicItem.Identifier({
                 name: propertyName,
             }),
-
         });
     } else {
         return NaslLogicItem.Identifier({
@@ -232,13 +228,7 @@ export const NaslUITypeAnnotation = {
 };
 
 export const NaslTypeAnnotation = {
-    Reference: ({
-        typeNamespace,
-        typeName,
-    }: {
-        typeNamespace: string;
-        typeName: string;
-    }) => ({
+    Reference: ({ typeNamespace, typeName }: { typeNamespace: string; typeName: string }) => ({
         concept: 'TypeAnnotation',
         name: '',
         typeKind: 'reference',
@@ -313,13 +303,7 @@ export const NaslLogicItem = {
         arguments: args,
     }),
     // 参数
-    Argument: ({
-        keyword,
-        expression,
-    }: {
-        keyword: string;
-        expression: any;
-    }) => ({
+    Argument: ({ keyword, expression }: { keyword: string; expression: any }) => ({
         concept: 'Argument',
         name: '',
         kind: 'Statement',
@@ -327,47 +311,27 @@ export const NaslLogicItem = {
         expression,
     }),
     // 成员表达式
-    MemberExpression: ({
-        object,
-        property,
-    }: {
-        object: any;
-        property: any;
-    }) => ({
+    MemberExpression: ({ object, property }: { object: any; property: any }) => ({
         concept: 'MemberExpression',
         name: '',
         kind: 'Expression',
-        objectqwer: object,
+        object,
         property,
     }),
     // 变量
-    Identifier: ({
-        name,
-    }: {
-        name: string;
-    }) => ({
+    Identifier: ({ name }: { name: string }) => ({
         concept: 'Identifier',
         kind: 'Expression',
         name,
     }),
     // 字面量
-    StringLiteral: ({
-        value,
-    }: {
-        value: string;
-    }) => ({
+    StringLiteral: ({ value }: { value: string }) => ({
         concept: 'StringLiteral',
         name: '',
         kind: 'Expression',
         value,
     }),
-    Assignment: ({
-        left,
-        right,
-    }: {
-        left: any;
-        right: any;
-    }) => ({
+    Assignment: ({ left, right }: { left: any; right: any }) => ({
         concept: 'Assignment',
         name: '',
         label: '赋值',
@@ -375,15 +339,7 @@ export const NaslLogicItem = {
         left,
         right,
     }),
-    IfStatement: ({
-        test,
-        consequent,
-        alternate,
-    }: {
-        test: any;
-        consequent: any[];
-        alternate: any[]
-    }) => ({
+    IfStatement: ({ test, consequent, alternate }: { test: any; consequent: any[]; alternate: any[] }) => ({
         concept: 'IfStatement',
         name: '',
         kind: 'Statement',
@@ -393,17 +349,7 @@ export const NaslLogicItem = {
     }),
 
     // 二元
-    BinaryExpression: ({
-        operator,
-        left,
-        label = '算术运算',
-        right,
-    }: {
-        operator: string;
-        left?: any;
-        right?: any;
-        label?: string;
-    }) => ({
+    BinaryExpression: ({ operator, left, label = '算术运算', right }: { operator: string; left?: any; right?: any; label?: string }) => ({
         concept: 'BinaryExpression',
         name: '',
         kind: 'Expression',
@@ -415,17 +361,7 @@ export const NaslLogicItem = {
 };
 
 export const NaslQueryExpression = {
-    QueryFieldExpression: ({
-        label,
-        isDotStar,
-        entityAsName,
-        propertyName,
-    }: {
-        label: string;
-        isDotStar: boolean;
-        entityAsName: string;
-        propertyName: string;
-    }) => ({
+    QueryFieldExpression: ({ label, isDotStar, entityAsName, propertyName }: { label: string; isDotStar: boolean; entityAsName: string; propertyName: string }) => ({
         concept: 'QueryFieldExpression',
         name: '',
         label,
@@ -434,15 +370,7 @@ export const NaslQueryExpression = {
         entityAsName,
         propertyName,
     }),
-    QueryFromExpression: ({
-        entityNamespace,
-        entityName,
-        joinParts,
-    }: {
-        entityNamespace: string;
-        entityName: string;
-        joinParts: any[];
-    }) => ({
+    QueryFromExpression: ({ entityNamespace, entityName, joinParts }: { entityNamespace: string; entityName: string; joinParts: any[] }) => ({
         concept: 'QueryFromExpression',
         name: '',
         kind: 'Expression',
@@ -475,17 +403,7 @@ export const NaslQueryExpression = {
         onExpressions,
         joinParts,
     }),
-    QuerySelectExpression: ({
-        label,
-        distinct,
-        star,
-        selectElements,
-    }: {
-        label?: string;
-        distinct?: boolean;
-        star?: boolean;
-        selectElements: any[],
-    }) => ({
+    QuerySelectExpression: ({ label, distinct, star, selectElements }: { label?: string; distinct?: boolean; star?: boolean; selectElements: any[] }) => ({
         concept: 'QuerySelectExpression',
         name: '',
         kind: 'Expression',
@@ -494,29 +412,13 @@ export const NaslQueryExpression = {
         star,
         selectElements,
     }),
-    QueryOrderByExpression: ({
-        label,
-        order,
-        orderElement,
-    }: {
-        label?: string;
-        order: any;
-        orderElement: any;
-    }) => ({
+    QueryOrderByExpression: ({ label, order, orderElement }: { label?: string; order: any; orderElement: any }) => ({
         concept: 'QueryOrderByExpression',
         label,
         order,
         orderElement,
     }),
-    QueryLimitExpression: ({
-        label,
-        pageElement,
-        pageSizeElement,
-    }: {
-        label?: string,
-        pageElement: any;
-        pageSizeElement: any;
-    }) => ({
+    QueryLimitExpression: ({ label, pageElement, pageSizeElement }: { label?: string; pageElement: any; pageSizeElement: any }) => ({
         concept: 'QueryLimitExpression',
         name: '',
         kind: 'Expression',
@@ -546,8 +448,8 @@ export const NaslQueryExpression = {
         groupBy: any[];
         having: any[];
         orderBy: any[];
-        logicName :string;
-        structureName :string;
+        logicName: string;
+        structureName: string;
     }) => ({
         concept: 'CallQueryComponent',
         name: '',
@@ -582,7 +484,7 @@ export const NaslNode = {
         variables?: any[];
         body?: any[];
         description?: string;
-        playground?: any[]
+        playground?: any[];
     }) => ({
         concept: 'Logic',
         name,
@@ -593,57 +495,27 @@ export const NaslNode = {
         description,
         playground,
     }),
-    Structure: ({
-        name,
-        properties,
-    }: {
-        name: string;
-        properties?: any[]
-    }) => ({
+    Structure: ({ name, properties }: { name: string; properties?: any[] }) => ({
         concept: 'Structure',
         name,
         properties,
     }),
-    StructureProperty: ({
-        name,
-        typeAnnotation,
-    }: {
-        name: string;
-        typeAnnotation?: any
-    }) => ({
+    StructureProperty: ({ name, typeAnnotation }: { name: string; typeAnnotation?: any }) => ({
         concept: 'StructureProperty',
         name,
         typeAnnotation,
     }),
-    Variable: ({
-        name,
-        typeAnnotation,
-    }: {
-        name: string;
-        typeAnnotation?: any
-    }) => ({
+    Variable: ({ name, typeAnnotation }: { name: string; typeAnnotation?: any }) => ({
         concept: 'Variable',
         name,
         typeAnnotation,
     }),
-    Param: ({
-        name,
-        typeAnnotation,
-    }: {
-        name: string;
-        typeAnnotation?: any
-    }) => ({
+    Param: ({ name, typeAnnotation }: { name: string; typeAnnotation?: any }) => ({
         concept: 'Param',
         name,
         typeAnnotation,
     }),
-    Return: ({
-        name,
-        typeAnnotation,
-    }: {
-        name: string;
-        typeAnnotation?: any
-    }) => ({
+    Return: ({ name, typeAnnotation }: { name: string; typeAnnotation?: any }) => ({
         concept: 'Return',
         name,
         typeAnnotation,