@lcap/nasl 3.2.0-beta.3 → 3.3.0-alpha

package/src/templator/genGridViewBlock.ts

@@ -2,14 +2,14 @@ import { config } from '../config';
 import * as utils from '../utils';
 import { App, Module, Namespace, Entity, EntityProperty, DataSource, ViewElement } from '../concepts';
 import {
-    filterProperty,
-    NameGroup,
-    genUniqueQueryNameGroup,
-    getFirstDisplayedProperty,
-    getParamFromLogic,
-    genLogicParam,
-    genCallComponentLogic,
-    genQueryLogic,
+  filterProperty,
+  NameGroup,
+  genUniqueQueryNameGroup,
+  getFirstDisplayedProperty,
+  getParamFromLogic,
+  genLogicParam,
+  genCallComponentLogic,
+  genQueryLogic,
 } from '.';
 import { NaslUITypeAnnotation, NaslLogicItem, NaslNode } from './utils';
 
@@ -18,80 +18,74 @@ import { NaslUITypeAnnotation, NaslLogicItem, NaslNode } from './utils';
  * @param property 实体属性
  */
 export function genGridViewCardTemplate(property: EntityProperty, nameGroup: NameGroup) {
-    const entity = property.entity;
-    const dataSource = entity.parentNode as DataSource;
-    const lowerEntityName = utils.firstLowerCase(entity.name);
-    const currentName = nameGroup.currentName || 'current';
-    let valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
-    const title = property.label || property.name;
+  const { entity } = property;
+  const dataSource = entity.parentNode as DataSource;
+  const lowerEntityName = utils.firstLowerCase(entity.name);
+  const currentName = nameGroup.currentName || 'current';
+  let valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
+  const title = property.label || property.name;
 
-    if (property.relationEntity) {
-        // 有外键关联
-        const relationEntity = dataSource?.findEntityByName(property.relationEntity);
-        if (relationEntity) {
-            const displayedProperty = getFirstDisplayedProperty(relationEntity);
-            if (displayedProperty) {
-                const relationLowerEntityName = utils.firstLowerCase(relationEntity.name);
-                valueExpression = `${currentName}.item.${relationLowerEntityName}.${displayedProperty.name}`;
-            } else
-                return '';
-        } else
-            return '';
-    } else {
-        valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
-    }
-    const getText = (property: EntityProperty) => {
-        const propertyTypeName = property.typeAnnotation.typeName;
-        if (propertyTypeName === 'Boolean') {
-            return `
+  if (property.relationEntity) {
+    // 有外键关联
+    const relationEntity = dataSource?.findEntityByName(property.relationEntity);
+    if (relationEntity) {
+      const displayedProperty = getFirstDisplayedProperty(relationEntity);
+      if (displayedProperty) {
+        const relationLowerEntityName = utils.firstLowerCase(relationEntity.name);
+        valueExpression = `${currentName}.item.${relationLowerEntityName}.${displayedProperty.name}`;
+      } else return '';
+    } else return '';
+  } else {
+    valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
+  }
+  const getText = (property: EntityProperty) => {
+    const propertyTypeName = property.typeAnnotation.typeName;
+    if (propertyTypeName === 'Boolean') {
+      return `
                 <u-text v-if="${valueExpression}" text="是"></u-text>
                 <u-text v-if="!${valueExpression}" text="否"></u-text>
                 `;
-        } else {
-            return `<u-text :text="${valueExpression}"></u-text>`;
-        }
-    };
+    }
+    return `<u-text :text="${valueExpression}"></u-text>`;
+  };
 
-    return `<u-linear-layout gap="small">
+  return `<u-linear-layout gap="small">
                 <u-text text="${title}:"></u-text>${getText(property)}
             </u-linear-layout>`;
 }
 
 export function genH5GridViewCardTemplate(property: EntityProperty, nameGroup?: NameGroup) {
-    const entity = property.entity;
-    const dataSource = entity.parentNode as DataSource;
-    const lowerEntityName = utils.firstLowerCase(entity.name);
+  const { entity } = property;
+  const dataSource = entity.parentNode as DataSource;
+  const lowerEntityName = utils.firstLowerCase(entity.name);
 
-    const currentName = nameGroup.currentName || 'current';
-    let valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
+  const currentName = nameGroup.currentName || 'current';
+  let valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
 
-    if (property.relationEntity) {
-        // 有外键关联
-        const relationEntity = dataSource?.findEntityByName(property.relationEntity);
-        if (relationEntity) {
-            const displayedProperty = getFirstDisplayedProperty(relationEntity);
-            if (displayedProperty) {
-                const relationLowerEntityName = utils.firstLowerCase(relationEntity.name);
-                valueExpression = `${currentName}.item.${relationLowerEntityName}.${displayedProperty.name}`;
-            } else
-                return '';
-        } else
-            return '';
-    } else {
-        valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
-    }
-    const getText = (property: EntityProperty) => {
-        const propertyTypeName = property.typeAnnotation.typeName;
-        if (propertyTypeName === 'Boolean') {
-            return `
+  if (property.relationEntity) {
+    // 有外键关联
+    const relationEntity = dataSource?.findEntityByName(property.relationEntity);
+    if (relationEntity) {
+      const displayedProperty = getFirstDisplayedProperty(relationEntity);
+      if (displayedProperty) {
+        const relationLowerEntityName = utils.firstLowerCase(relationEntity.name);
+        valueExpression = `${currentName}.item.${relationLowerEntityName}.${displayedProperty.name}`;
+      } else return '';
+    } else return '';
+  } else {
+    valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
+  }
+  const getText = (property: EntityProperty) => {
+    const propertyTypeName = property.typeAnnotation.typeName;
+    if (propertyTypeName === 'Boolean') {
+      return `
                 <van-text v-if="${valueExpression}" text="是" display="block"></van-text>
                 <van-text v-if="!${valueExpression}" text="否" display="block"></van-text>
                 `;
-        } else {
-            return `<van-text :text="${valueExpression}" display="block"></van-text>`;
-        }
-    };
-    return `${getText(property)}`;
+    }
+    return `<van-text :text="${valueExpression}" display="block"></van-text>`;
+  };
+  return `${getText(property)}`;
 }
 
 /**
@@ -99,13 +93,10 @@ export function genH5GridViewCardTemplate(property: EntityProperty, nameGroup?:
  * @param entity 实体
  * @param nameGroup 命名组
  */
-export function genGridViewTemplate(entity: Entity, nameGroup: NameGroup, newLogic: any, modifyable?: boolean, entryFromCall?: string) {
-    const properties = entity.properties.filter(filterProperty('inTable'));
-    let dataSourceValue = `(params) => ${newLogic.name}(params.page, params.size,params.sort,params.order)`;
-    if (['genCurdMultipleKeyBlock'].includes(entryFromCall)) {
-        dataSourceValue = `(params) => ${newLogic.name}(params.page, params.size,params.sort,params.order,filter)`;
-    }
-    return `<u-grid-view ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" data-schema="${nameGroup.structure}"
+export function genGridViewTemplate(entity: Entity, nameGroup: NameGroup, modifyable?: boolean) {
+  const currentName = nameGroup.currentName || 'current';
+  const properties = entity.properties.filter(filterProperty('inTable'));
+  return `<u-grid-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
         value-field="${nameGroup.viewVariableEntity}.id"
         :page-size="20"
         :pageable="true"
@@ -119,7 +110,7 @@ export function genGridViewTemplate(entity: Entity, nameGroup: NameGroup, newLog
         <template #item="current">
             <u-card title="">
                 <u-linear-layout direction="vertical" gap="small">
-                    ${properties.map((property) => genGridViewCardTemplate(property, nameGroup) + '\n').join('')}
+                    ${properties.map((property) => `${genGridViewCardTemplate(property, nameGroup)}\n`).join('')}
                     <u-linear-layout gap="small">
                         <u-link ${modifyable ? `@click="${nameGroup.viewLogicModify || 'modify'}"` : ''}>修改</u-link>
                         <u-link @click="${nameGroup.viewLogicRemove}">删除</u-link>
@@ -131,20 +122,17 @@ export function genGridViewTemplate(entity: Entity, nameGroup: NameGroup, newLog
 `;
 }
 
-export function genH5GridViewTemplate(entity: Entity, nameGroup: NameGroup, newLogic: any, modifyable?: boolean, entryFromCall?: string) {
-    const properties = entity.properties.filter(filterProperty('inTable'));
-    let dataSourceValue = `(params) => ${newLogic.name}(params.page, params.size,params.sort,params.order)`;
-    if (['genCurdMultipleKeyBlock'].includes(entryFromCall)) {
-        dataSourceValue = `(params) => ${newLogic.name}(params.page, params.size,params.sort,params.order,filter)`;
-    }
-    return `<van-grid-view ref="gridView" :data-source="${dataSourceValue}" data-schema="${nameGroup.structure}"
+export function genH5GridViewTemplate(entity: Entity, nameGroup: NameGroup) {
+  const currentName = nameGroup.currentName || 'current';
+  const properties = entity.properties.filter(filterProperty('inTable'));
+  return `<van-grid-view ref="gridView" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
     pageable="auto-more"
     :remote-paging="true"
     :col="2"
     :iffall="false">
     <template #item="current">
         <van-cardu no-title>
-            ${properties.map((property) => genH5GridViewCardTemplate(property, nameGroup) + '\n').join('')}
+            ${properties.map((property) => `${genH5GridViewCardTemplate(property, nameGroup)}\n`).join('')}
         </van-cardu>
     </template>
 </van-grid-view>
@@ -156,48 +144,47 @@ export function genH5GridViewTemplate(entity: Entity, nameGroup: NameGroup, newL
  * @param entity 实体
  */
 export function genGridViewLoadLogic(entity: Entity, nameGroup: NameGroup, newLogic: any, supportFilter: boolean) {
-    const moduleNode = entity.app;
-    const moduleNamespace = moduleNode?.getNamespace();
-    const params = [
-        genLogicParam(`${newLogic.params[0].name}`, 'params.page'),
-        genLogicParam(`${newLogic.params[1].name}`, 'params.size'),
-        genLogicParam(`${newLogic.params[2].name}`, 'params.sort'),
-        genLogicParam(`${newLogic.params[3].name}`, 'params.order'),
-    ];
+  const moduleNode = entity.app;
+  const moduleNamespace = moduleNode?.getNamespace();
+  const params = [
+    genLogicParam(`${newLogic.params[0].name}`, 'params.page'),
+    genLogicParam(`${newLogic.params[1].name}`, 'params.size'),
+    genLogicParam(`${newLogic.params[2].name}`, 'params.sort'),
+    genLogicParam(`${newLogic.params[3].name}`, 'params.order'),
+  ];
 
-    if (supportFilter)
-        params.push(genLogicParam(`${newLogic.params[4].name}`, nameGroup.viewVariableFilter));
+  if (supportFilter) params.push(genLogicParam(`${newLogic.params[4].name}`, nameGroup.viewVariableFilter));
 
-    return NaslNode.Logic({
-        name: nameGroup.viewLogicLoad,
-        params: [
-            NaslNode.Param({
-                name: 'params',
-                typeAnnotation: NaslUITypeAnnotation.DataSourceParams,
-            }),
-        ],
-        returns: [
-            NaslNode.Return({
-                name: 'result',
-                typeAnnotation: null,
-            }),
-        ],
-        variables: [] as any[],
-        body: [
-            NaslLogicItem.Start,
-            NaslLogicItem.Assignment({
-                left: NaslLogicItem.Identifier({
-                    name: 'result',
-                }),
-                right: NaslLogicItem.CallLogic({
-                    calleeNamespace: `${moduleNamespace}.logics`,
-                    calleeName: newLogic.name,
-                    arguments: params,
-                }),
-            }),
-            NaslLogicItem.End,
-        ],
-    });
+  return NaslNode.Logic({
+    name: nameGroup.viewLogicLoad,
+    params: [
+      NaslNode.Param({
+        name: 'params',
+        typeAnnotation: NaslUITypeAnnotation.DataSourceParams,
+      }),
+    ],
+    returns: [
+      NaslNode.Return({
+        name: 'result',
+        typeAnnotation: null,
+      }),
+    ],
+    variables: [] as any[],
+    body: [
+      NaslLogicItem.Start,
+      NaslLogicItem.Assignment({
+        left: NaslLogicItem.Identifier({
+          name: 'result',
+        }),
+        right: NaslLogicItem.CallLogic({
+          calleeNamespace: `${moduleNamespace}.logics`,
+          calleeName: newLogic.name,
+          arguments: params,
+        }),
+      }),
+      NaslLogicItem.End,
+    ],
+  });
 }
 
 /**
@@ -205,36 +192,35 @@ export function genGridViewLoadLogic(entity: Entity, nameGroup: NameGroup, newLo
  * @param entity 实体
  */
 export function genGridViewRemoveLogic(entity: Entity, nameGroup: NameGroup) {
-    const lowerEntityName = utils.firstLowerCase(entity.name);
-    const ns = entity.ns;
-    const deleteLogic = ns?.logics?.find((logic) => logic.name === `delete`);
-    const idPropertys = entity.properties.filter((property) => property.primaryKey || property.name === 'id');
-    const currentName = nameGroup.currentName || 'current';
+  const lowerEntityName = utils.firstLowerCase(entity.name);
+  const { ns } = entity;
+  const deleteLogic = ns?.logics?.find((logic) => logic.name === `delete`);
+  const idPropertys = entity.properties.filter((property) => property.primaryKey || property.name === 'id');
+  const currentName = nameGroup.currentName || 'current';
 
-    return NaslNode.Logic({
-        name: nameGroup.viewLogicRemove,
-        params: [
-        ],
-        returns: [] as any[],
-        variables: [] as any[],
-        body: [
-            NaslLogicItem.Start,
-            NaslLogicItem.CallLogic({
-                calleeNamespace: deleteLogic.getNamespace(),
-                calleeName: deleteLogic.name,
-                arguments: idPropertys.map((idProperty) => {
-                    let paramFromLogic = getParamFromLogic(deleteLogic, idProperty.name);
-                    // 如果旧逻辑，但是新导入表中，id的name 不是id 的话，就直接使用名称叫id的
-                    if (!paramFromLogic) {
-                        paramFromLogic = getParamFromLogic(deleteLogic, 'id');
-                    }
-                    return genLogicParam(paramFromLogic.name, `${currentName}.item.${lowerEntityName}.${paramFromLogic.name}`);
-                }),
-            }),
-            genCallComponentLogic(nameGroup.viewElementMainView, 'reload'),
-            NaslLogicItem.End,
-        ],
-    });
+  return NaslNode.Logic({
+    name: nameGroup.viewLogicRemove,
+    params: [],
+    returns: [] as any[],
+    variables: [] as any[],
+    body: [
+      NaslLogicItem.Start,
+      NaslLogicItem.CallLogic({
+        calleeNamespace: deleteLogic.getNamespace(),
+        calleeName: deleteLogic.name,
+        arguments: idPropertys.map((idProperty) => {
+          let paramFromLogic = getParamFromLogic(deleteLogic, idProperty.name);
+          // 如果旧逻辑，但是新导入表中，id的name 不是id 的话，就直接使用名称叫id的
+          if (!paramFromLogic) {
+            paramFromLogic = getParamFromLogic(deleteLogic, 'id');
+          }
+          return genLogicParam(paramFromLogic.name, `${currentName}.item.${lowerEntityName}.${paramFromLogic.name}`);
+        }),
+      }),
+      genCallComponentLogic(nameGroup.viewElementMainView, 'reload'),
+      NaslLogicItem.End,
+    ],
+  });
 }
 
 /**
@@ -248,40 +234,39 @@ export function genGridViewRemoveLogic(entity: Entity, nameGroup: NameGroup) {
  */
 // 数据网格（简）
 export function genGridViewBlock(entity: Entity, oldNode: ViewElement) {
-    const view = oldNode.view;
-    const dataSource = entity.parentNode as DataSource;
-    const module = dataSource.app;
+  const { view } = oldNode;
+  const dataSource = entity.parentNode as DataSource;
+  const module = dataSource.app;
 
-    const viewElementMainView = view.getViewElementUniqueName('gridView');
-    const nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView);
-    nameGroup.viewElementMainView = viewElementMainView;
-    nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
-    nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
+  const viewElementMainView = view.getViewElementUniqueName('gridView');
+  const nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView);
+  nameGroup.viewElementMainView = viewElementMainView;
+  nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
+  nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
 
-    // 当前节点的currentName
-    nameGroup.currentName = oldNode.getCurrentName();
-    // 收集所有和本实体关联的实体
-    const entitySet: Set<Entity> = new Set();
-    entitySet.add(entity);
-    const newLogics: any[] = [];
-    entity.properties.forEach((property) => {
-        if (property.relationEntity) {
-            // 有外键关联
-            const relationEntity = dataSource?.findEntityByName(property.relationEntity);
-            if (relationEntity) {
-                const displayedProperty = getFirstDisplayedProperty(relationEntity);
-                if (displayedProperty)
-                    entitySet.add(relationEntity);
-            }
-        }
-    });
-    const allEntities = [...entitySet];
-    const entityLogic = genQueryLogic(allEntities, nameGroup, false, true, module);
-    newLogics.push(entityLogic);
+  // 当前节点的currentName
+  nameGroup.currentName = oldNode.getCurrentName();
+  // 收集所有和本实体关联的实体
+  const entitySet: Set<Entity> = new Set();
+  entitySet.add(entity);
+  const newLogics: any[] = [];
+  entity.properties.forEach((property) => {
+    if (property.relationEntity) {
+      // 有外键关联
+      const relationEntity = dataSource?.findEntityByName(property.relationEntity);
+      if (relationEntity) {
+        const displayedProperty = getFirstDisplayedProperty(relationEntity);
+        if (displayedProperty) entitySet.add(relationEntity);
+      }
+    }
+  });
+  const allEntities = [...entitySet];
+  const entityLogic = genQueryLogic(allEntities, nameGroup, false, true, module);
+  newLogics.push(entityLogic);
 
-    return `
+  return `
 <template>
-    ${config.scope === 'h5' ? genH5GridViewTemplate(entity, nameGroup, entityLogic) : genGridViewTemplate(entity, nameGroup, entityLogic)}
+    ${config.scope === 'h5' ? genH5GridViewTemplate(entity, nameGroup) : genGridViewTemplate(entity, nameGroup)}
 </template>
 <definition>
 {
@@ -297,39 +282,38 @@ export function genGridViewBlock(entity: Entity, oldNode: ViewElement) {
 }
 
 export function genGridViewCardBlock(property: EntityProperty, oldNode: ViewElement) {
-    const view = oldNode.view;
-    const entity = property.entity;
-    const dataSource = entity.parentNode as DataSource;
-    const module = dataSource.app;
+  const { view } = oldNode;
+  const { entity } = property;
+  const dataSource = entity.parentNode as DataSource;
+  const module = dataSource.app;
 
-    const viewElementMainView = view.getViewElementUniqueName('gridView');
-    const nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView);
-    nameGroup.viewElementMainView = viewElementMainView;
-    nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
-    nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
+  const viewElementMainView = view.getViewElementUniqueName('gridView');
+  const nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView);
+  nameGroup.viewElementMainView = viewElementMainView;
+  nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
+  nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
 
-    // 收集所有和本实体关联的实体
-    const entitySet: Set<Entity> = new Set();
-    entitySet.add(entity);
-    const newLogics: any[] = [];
-    entity.properties.forEach((property) => {
-        if (property.relationEntity) {
-            // 有外键关联
-            const relationEntity = dataSource?.findEntityByName(property.relationEntity);
-            if (relationEntity) {
-                const displayedProperty = getFirstDisplayedProperty(relationEntity);
-                if (displayedProperty)
-                    entitySet.add(relationEntity);
-            }
-        }
-    });
-    const allEntities = [...entitySet];
-    const entityLogic = genQueryLogic(allEntities, nameGroup, true, true, module);
-    newLogics.push(entityLogic);
+  // 收集所有和本实体关联的实体
+  const entitySet: Set<Entity> = new Set();
+  entitySet.add(entity);
+  const newLogics: any[] = [];
+  entity.properties.forEach((property) => {
+    if (property.relationEntity) {
+      // 有外键关联
+      const relationEntity = dataSource?.findEntityByName(property.relationEntity);
+      if (relationEntity) {
+        const displayedProperty = getFirstDisplayedProperty(relationEntity);
+        if (displayedProperty) entitySet.add(relationEntity);
+      }
+    }
+  });
+  const allEntities = [...entitySet];
+  const entityLogic = genQueryLogic(allEntities, nameGroup, true, true, module);
+  newLogics.push(entityLogic);
 
-    return `
+  return `
     <template>
-        ${genGridViewTemplate(entity, nameGroup, entityLogic)}
+        ${genGridViewTemplate(entity, nameGroup)}
     </template>
     <definition>
     {