@lcap/nasl 3.7.0-alpha.1 → 3.7.0-beta.1

package/src/templator/genGridViewBlock.ts

@@ -96,21 +96,21 @@ export function genH5GridViewCardTemplate(property: EntityProperty, nameGroup?:
 export function genGridViewTemplate(entity: Entity, nameGroup: NameGroup, newLogic: any, modifyable?: boolean, entryFromCall?: string) {
   const currentName = nameGroup.currentName || 'current';
   const properties = entity.properties.filter(filterProperty('inTable'));
-  let dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size,elements.$ce.sort,elements.$ce.order)`;
+  let dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size)`;
   if (['genCurdMultipleKeyBlock'].includes(entryFromCall)) {
-      dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size,elements.$ce.sort,elements.$ce.order,${nameGroup.viewVariableFilter})`;
+      dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size,${nameGroup.viewVariableFilter})`;
   }
-  return `<u-grid-view ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" data-schema="${nameGroup.structure}"
-        value-field="${nameGroup.viewVariableEntity}.id"
-        :page-size="50"
-        :page-number="1"
+  return `<u-grid-view ref="${nameGroup.viewElementMainView}" :dataSource="${dataSourceValue}" dataSchema="${nameGroup.structure}"
+        valueField="${utils.firstLowerCase(entity.name)}.${entity.properties.find((p) => p.primaryKey)?.name || 'id'}"
+        :pageSize="50"
+        :pageNumber="1"
         :pageable="true"
-        :remote-paging="true"
-        :show-sizer="true"
+        :remotePaging="true"
+        :showSizer="true"
         :repeat="4"
         :border="false"
         :readonly="true"
-        :show-foot="true"
+        :showFoot="true"
         style="height:auto">
         <template #item="current">
             <u-card title="">
@@ -130,15 +130,15 @@ export function genGridViewTemplate(entity: Entity, nameGroup: NameGroup, newLog
 export function genH5GridViewTemplate(entity: Entity, nameGroup: NameGroup, newLogic: any, modifyable?: boolean, entryFromCall?: string) {
     const currentName = nameGroup.currentName || 'current';
     const properties = entity.properties.filter(filterProperty('inTable'));
-    let dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size,elements.$ce.sort,elements.$ce.order)`;
+    let dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size)`;
     if (['genCurdMultipleKeyBlock'].includes(entryFromCall)) {
-      dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size,elements.$ce.sort,elements.$ce.order,${nameGroup.viewVariableFilter})`;
+      dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size,${nameGroup.viewVariableFilter})`;
     }
-    return `<van-grid-view ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" data-schema="${nameGroup.structure}"
+    return `<van-grid-view ref="${nameGroup.viewElementMainView}" :dataSource="${dataSourceValue}" dataSchema="${nameGroup.structure}"
     pageable="auto-more"
-    :page-size="50"
-    :page-number="1"
-    :remote-paging="true"
+    :pageSize="50"
+    :pageNumber="1"
+    :remotePaging="true"
     :col="2"
     :iffall="false">
     <template #item="current">
@@ -160,11 +160,9 @@ export function genGridViewLoadLogic(entity: Entity, nameGroup: NameGroup, newLo
   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[2].name}`, nameGroup.viewVariableFilter));
 
   return NaslNode.Logic({
     name: nameGroup.viewLogicLoad,
@@ -273,7 +271,7 @@ export function genGridViewBlock(entity: Entity, oldNode: ViewElement) {
     }
   });
   const allEntities = [...entitySet];
-  const entityLogic = genQueryLogic(allEntities, nameGroup, false, true, module);
+  const entityLogic = genQueryLogic(allEntities, nameGroup, false, false, module);
   newLogics.push(entityLogic);
 
   return `
@@ -321,7 +319,7 @@ export function genGridViewCardBlock(property: EntityProperty, oldNode: ViewElem
     }
   });
   const allEntities = [...entitySet];
-  const entityLogic = genQueryLogic(allEntities, nameGroup, true, true, module);
+  const entityLogic = genQueryLogic(allEntities, nameGroup, true, false, module);
   newLogics.push(entityLogic);
 
   return `

package/src/templator/genListViewBlock.ts

@@ -10,11 +10,11 @@ export function genListViewTemplate(property: EntityProperty, nameGroup: NameGro
   const currentName = nameGroup.currentName || 'current';
   const valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
   let dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size)`;
-  return `<u-list-view ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" data-schema="${nameGroup.structure}"
-  :page-size="50"
-  :page-number="1"
-    text-field="${nameGroup.viewVariableEntity}.${property.name}"
-    value-field="${nameGroup.viewVariableEntity}.id" :pageable="true" :remote-paging="true">
+  return `<u-list-view ref="${nameGroup.viewElementMainView}" :dataSource="${dataSourceValue}" dataSchema="${nameGroup.structure}"
+  :pageSize="50"
+  :pageNumber="1"
+    textField="${nameGroup.viewVariableEntity}.${property.name}"
+    valueField="${lowerEntityName}.id" :pageable="true" :remotePaging="true">
     <template #item="current">
         <u-linear-layout>
             <u-text :text="${valueExpression}"></u-text>
@@ -29,11 +29,11 @@ export function genH5ListViewTemplate(property: EntityProperty, nameGroup: NameG
   const currentName = nameGroup.currentName || 'current';
   const valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
   let dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size)`;
-  return `<van-list-view ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" data-schema="${nameGroup.structure}"
-  :page-size="50"
-  :page-number="1"
-    text-field="${nameGroup.viewVariableEntity}.${property.name}"
-    value-field="${nameGroup.viewVariableEntity}.id" pageable="auto-more" :remote-paging="true">
+  return `<van-list-view ref="${nameGroup.viewElementMainView}" :dataSource="${dataSourceValue}" dataSchema="${nameGroup.structure}"
+  :pageSize="50"
+  :pageNumber="1"
+    textField="${nameGroup.viewVariableEntity}.${property.name}"
+    valueField="${lowerEntityName}.id" pageable="auto-more" :remotePaging="true">
     <template #item="current">
         <van-cell :value="${valueExpression}" isLink>
             <template #title>{{ ${valueExpression} }}</template>

package/src/templator/genQueryComponent.ts

@@ -162,45 +162,40 @@ export function genQueryAssignment(allEntities: Array<Entity>, nameGroup: NameGr
       })
     ),
   ];
-  return NaslLogicItem.Assignment({
-    left: NaslLogicItem.Identifier({
-      name: 'result',
-    }),
-    right: NaslQueryExpression.CallQueryComponent({
-      label: '数据查询',
-      // 2.11版本的数据查询，返回类型将自动推断
-      // 2.22版本的数据查询，实体支持列筛选，(select.selectElements 会初始化实体对应的 QueryFieldExpression 节点)
-      ideVersion: '2.22',
-      typeAnnotation: NaslTypeAnnotation.AnonymousStructure(aStructureProperties),
-      select,
-      from,
-      where,
-      groupBy: [],
-      having: null,
-      orderBy: supportSort
-        ? [
-            NaslQueryExpression.QueryOrderByExpression({
-              label: '查询组件OrderBy元素',
-              order: NaslLogicItem.Identifier({
-                name: 'order',
-              }),
-              orderElement: NaslLogicItem.Identifier({
-                name: 'sort',
-              }),
+  const callQueryComponent = NaslQueryExpression.CallQueryComponent({
+    label: '数据查询',
+    // 2.11版本的数据查询，返回类型将自动推断
+    // 2.22版本的数据查询，实体支持列筛选，(select.selectElements 会初始化实体对应的 QueryFieldExpression 节点)
+    ideVersion: '2.22',
+    typeAnnotation: NaslTypeAnnotation.AnonymousStructure(aStructureProperties),
+    select,
+    from,
+    where,
+    groupBy: [],
+    having: null,
+    orderBy: supportSort
+      ? [
+          NaslQueryExpression.QueryOrderByExpression({
+            label: '查询组件OrderBy元素',
+            order: NaslLogicItem.Identifier({
+              name: 'order',
             }),
-          ]
-        : [],
-      logicName: nameGroup.logic,
-      structureName: nameGroup.structure,
-      limit: NaslQueryExpression.QueryLimitExpression({
-        label: '查询组件 Limit 子句',
-        pageElement: NaslLogicItem.Identifier({
-          name: 'page',
-        }),
-        pageSizeElement: NaslLogicItem.Identifier({
-          name: 'size',
-        }),
-      }),
+            orderElement: NaslLogicItem.Identifier({
+              name: 'sort',
+            }),
+          }),
+        ]
+      : [],
+    logicName: nameGroup.logic,
+    structureName: nameGroup.structure,
+    limit: null,
+  });
+  return NaslLogicItem.Assignment({
+    left: NaslLogicItem.Identifier({ name: 'result' }),
+    right: NaslLogicItem.Paginate({
+      list: callQueryComponent,
+      page: NaslLogicItem.Identifier({ name: 'page' }),
+      size: NaslLogicItem.Identifier({ name: 'size' }),
     }),
   });
 }

package/src/templator/genSelectBlock.ts

@@ -12,9 +12,9 @@ import { NaslUITypeAnnotation, NaslCollectionTypeAnnotation, NaslLogicItem, Nasl
  */
 export function genSelectTemplate(property: EntityProperty, nameGroup: NameGroup, newLogic: any) {
   let dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size)`
-  return `<u-select clearable placeholder="请选择" ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" :page-size="50" data-schema="${nameGroup.structure}"
-    text-field="${nameGroup.lowerEntity}.${property.name}"
-    value-field="${nameGroup.lowerEntity}.id" :pagination="true">
+  return `<u-select :clearable="true" placeholder="请选择" ref="${nameGroup.viewElementMainView}" :dataSource="${dataSourceValue}" :pageSize="50" dataSchema="${nameGroup.structure}"
+    textField="${nameGroup.lowerEntity}.${property.name}"
+    valueField="${nameGroup.lowerEntity}.id" :pagination="true">
 </u-select>`;
 }
 
@@ -27,21 +27,21 @@ export function genSelectTemplate(property: EntityProperty, nameGroup: NameGroup
 export function genH5SelectTemplate(property: EntityProperty, nameGroup: NameGroup, newLogic: any) {
   const label = property.label || property.name;
   let dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size)`;
-  return `<van-pickerson type="list" :show-toolbar="true" title="请选择" placeholder="请选择" ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" :page-size="50" data-schema="${nameGroup.structure}"
-    text-field="${nameGroup.lowerEntity}.${property.name}"
-    value-field="${nameGroup.lowerEntity}.id" :pageable="true" :remote-paging="true">
+  return `<van-pickerson type="list" :showToolbar="true" title="请选择" placeholder="请选择" ref="${nameGroup.viewElementMainView}" :dataSource="${dataSourceValue}" :pageSize="50" dataSchema="${nameGroup.structure}"
+    textField="${nameGroup.lowerEntity}.${property.name}"
+    valueField="${nameGroup.lowerEntity}.id" :pageable="true" :remotePaging="true">
     <template #title>${label}</template>
     <template #pannel-title>
       <van-text text="请选择"></van-text>
     </template>
     <template #picker-top>
-      <van-picker-action-slot target-method="cancel">
+      <van-picker-action-slot targetMethod="cancel">
         <van-iconv name="left-arrow" icotype="only"></van-iconv>
       </van-picker-action-slot>
-      <van-picker-action-slot target-method="confirm"></van-picker-action-slot>
+      <van-picker-action-slot targetMethod="confirm"></van-picker-action-slot>
     </template>
     <template #picker-bottom>
-      <van-picker-action-slot target-method="cancel">
+      <van-picker-action-slot targetMethod="cancel">
         <van-button
           type="info_secondary"
           size="normal"
@@ -49,7 +49,7 @@ export function genH5SelectTemplate(property: EntityProperty, nameGroup: NameGro
           squareroud="round"
         ></van-button>
       </van-picker-action-slot>
-      <van-picker-action-slot target-method="confirm">
+      <van-picker-action-slot targetMethod="confirm">
         <van-button
           type="info"
           size="normal"

package/src/templator/genTableBlock.ts

@@ -69,9 +69,9 @@ export function genTableTemplate(entity: Entity, nameGroup: NameGroup, newLogic:
   if (['genCurdMultipleKeyBlock'].includes(entryFromCall)) {
     dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size,elements.$ce.sort,elements.$ce.order,${nameGroup.viewVariableFilter})`;
   }
-  return `<u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" data-schema="${nameGroup.structure}"
-        value-field="${nameGroup.viewVariableEntity}.id"
-        :pagination="true" :show-sizer="true" :page-size="20" :page-number="1">
+  return `<u-table-view ref="${nameGroup.viewElementMainView}" :dataSource="${dataSourceValue}" dataSchema="${nameGroup.structure}"
+        valueField="${utils.firstLowerCase(entity.name)}.${entity.properties.find((p) => p.primaryKey)?.name || 'id'}"
+        :pagination="true" :showSizer="true" :pageSize="20" :pageNumber="1">
     <u-table-view-column type="index" width="60">
         <template #title><u-text text="序号"></u-text></template>
         <template #cell="current"></template>
@@ -277,9 +277,7 @@ export function genTableColumnBlock(property: EntityProperty, oldNode: ViewEleme
   let dataSourceValue = `(params) => ${entityLogic.name}(elements.$ce.page, elements.$ce.size,elements.$ce.sort,elements.$ce.order)`;
   return `
 <template>
-    <u-table-view ref="${
-      nameGroup.viewElementMainView
-    }" :data-source="${dataSourceValue}" :pagination="true" :page-size="20" :page-number="1" :show-sizer="true" data-schema="${nameGroup.structure}">
+    <u-table-view ref="${nameGroup.viewElementMainView}" :dataSource="${dataSourceValue}" :pagination="true" :pageSize="20" :pageNumber="1" :showSizer="true" dataSchema="${nameGroup.structure}">
         ${properties.map((property) => `${genTableColumnTemplate(property)}\n`).join('')}
     </u-table-view>
 </template>
@@ -306,7 +304,17 @@ export function genTableTemplateTableDesigner(
   optionsMap?: any
 ) {
   const currentName = nameGroup.currentName || 'current';
-  const properties = entity.properties.filter(filterProperty('inTable'));
+  const _properties = entity.properties.filter(filterProperty('inTable'));
+  // properties 中name 是createdTime和updatedTime移到最后面
+  const lastProperties = _properties.filter((property) => ['createdTime', 'updatedTime'].includes(property.name));
+  const otherProperties = _properties.filter((property) => !['createdTime', 'updatedTime'].includes(property.name));
+  const properties = [...otherProperties, ...lastProperties];
+
+  function getName(name: string) {
+    const _name = name.replace(/[A-Z]/g, (item) => '-' + item.toLowerCase());
+    return _name[0] === '-' ? _name.slice(1) : _name;
+  }
+
   let dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size,elements.$ce.sort,elements.$ce.order)`;
   if (['genCurdMultipleKeyBlock'].includes(entryFromCall)) {
     dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size,elements.$ce.sort,elements.$ce.order,${nameGroup.viewVariableFilter})`;
@@ -317,7 +325,7 @@ export function genTableTemplateTableDesigner(
       <u-uploader
         style="--custom-start: auto;margin-right: 5px"
         display="inline"
-        url="/api/${entity.name.toLowerCase()}/import"
+        url="/api/${getName(entity.name)}/import"
         url-field="filePath"
         :limit="999"
         max-size="50MB"
@@ -359,9 +367,9 @@ export function genTableTemplateTableDesigner(
         <u-button color="default" icon="upload" text="上传"></u-button
       ></u-uploader>
       <u-button style="margin-right: 5px" icon="download" @click="${nameGroup.viewLogicExportData}">导 出</u-button>
-      <u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" data-schema="${nameGroup.structure}"
-      value-field="${nameGroup.viewVariableEntity}.id"
-      :pagination="true" :show-sizer="true" :page-size="20" :page-number="1" style="margin-top: 12px">
+      <u-table-view ref="${nameGroup.viewElementMainView}" :dataSource="${dataSourceValue}" dataSchema="${nameGroup.structure}"
+      valueField="${utils.firstLowerCase(entity.name)}.${entity.properties.find((p) => p.primaryKey)?.name || 'id'}"
+      :pagination="true" :showSizer="true" :pageSize="20" :pageNumber="1" style="margin-top: 12px">
       <u-table-view-column type="index" width="60"><template #title><u-text text="序号"></u-text></template><template #cell="current"></template></u-table-view-column>
       ${properties.map((property) => `${genTableColumnTemplateTableDesigner(property, currentName, optionsMap)}\n`).join('')}
         <u-table-view-column title="操作">
@@ -399,7 +407,7 @@ export const genTableColumnTemplateTableDesigner = (property: EntityProperty, cu
     if (hasOptions) {
       const options = optionsMap[property.name];
       return `
-      <u-select :preview="true" :value="${valueExpression}" placeholder="--" ${multiple ? 'multiple' : ''}>
+      <u-select :preview="true" :value="${valueExpression}" placeholder="--" ${multiple ? 'multiple  tags-overflow="visible" ' : ''}>
                     ${options.map((option: any) => `<u-select-item value="${option.value}" text="${option.label}">${option.label}</u-select-item>`)}
                   </u-select>
       `;

package/src/templator/genUpdateBlock.ts

@@ -56,8 +56,8 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
               const key = [property.name, relationEntity.name].join('-');
               const selectNameGroup = selectNameGroupMap.get(key);
               formItem += `
-                  <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.viewLogicLoad}"
-                      text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
+                  <u-select :clearable="true" placeholder="请选择${label}" :dataSource="${selectNameGroup.viewLogicLoad}"
+                      textField="${lowerEntityName}.${displayedProperty.name}" valueField="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
                   </u-select>
               `;
             } else
@@ -66,7 +66,7 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
             return '';
         } else if (propertyTypeName === 'Boolean') {
           formItem += `
-                <u-select clearable v-model="${vModel}" placeholder="请输入${label}">
+                <u-select :clearable="true" v-model="${vModel}" placeholder="请输入${label}">
                     <u-select-item :value="true" text="是">是</u-select-item>
                     <u-select-item :value="false" text="否">否</u-select-item>
                 </u-select>
@@ -80,11 +80,11 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
         } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 256) {
           formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}"></u-textarea>`;
         } else if (propertyTypeName === 'Date') {
-          formItem += `<u-date-picker clearable :value.sync="${vModel}" placeholder="请输入${label}"></u-date-picker>`;
+          formItem += `<u-date-picker :clearable="true" :value.sync="${vModel}" placeholder="请输入${label}"></u-date-picker>`;
         } else if (propertyTypeName === 'Time') {
           formItem += `<u-time-picker :value.sync="${vModel}" placeholder="请输入${label}"></u-time-picker>`;
         } else if (propertyTypeName === 'DateTime') {
-          formItem += `<u-date-time-picker clearable :value.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
+          formItem += `<u-date-time-picker :clearable="true" :value.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
         } else {
           const namespaceArr = propertyTypeNamespace.split('.');
           const type = namespaceArr.pop();
@@ -143,21 +143,21 @@ export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, se
               let dataSourceValue = `(params) => ${selectNameGroup.logic}(elements.$ce.page, elements.$ce.size)`;
               formItem += `
                         <template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-pickerson type="list" :show-toolbar="true" title="请选择${label}" placeholder="请选择${label}"
-                            v-model="${vModel}" :data-source="${dataSourceValue}" :page-size="50"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}"
+                            v-model="${vModel}" :dataSource="${dataSourceValue}" :pageSize="50"
+                            textField="${lowerEntityName}.${displayedProperty.name}" valueField="${lowerEntityName}.${relationProperty.name}"
                             :notitleblock="true"
-                            :pageable="true" input-align="left" :remote-paging="true">
+                            :pageable="true" inputAlign="left" :remotePaging="true">
                             <template #pannel-title>
                             <van-text text="请选择${label}"></van-text>
                           </template>
                           <template #picker-top>
-                            <van-picker-action-slot target-method="cancel">
+                            <van-picker-action-slot targetMethod="cancel">
                               <van-iconv name="left-arrow" icotype="only"></van-iconv>
                             </van-picker-action-slot>
-                            <van-picker-action-slot target-method="confirm"></van-picker-action-slot>
+                            <van-picker-action-slot targetMethod="confirm"></van-picker-action-slot>
                           </template>
                           <template #picker-bottom>
-                            <van-picker-action-slot target-method="cancel">
+                            <van-picker-action-slot targetMethod="cancel">
                               <van-button
                                 type="info_secondary"
                                 size="normal"
@@ -165,7 +165,7 @@ export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, se
                                 squareroud="round"
                               ></van-button>
                             </van-picker-action-slot>
-                            <van-picker-action-slot target-method="confirm">
+                            <van-picker-action-slot targetMethod="confirm">
                               <van-button
                                 type="info"
                                 size="normal"
@@ -189,11 +189,11 @@ export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, se
           formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-fieldtextarea v-model="${vModel}" placeholder="请输入${label}"></van-fieldtextarea></van-linear-layout></template>`;
           // @TODO
         } else if (propertyTypeName === 'Date') {
-          formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-calendar clearable :value.sync="${vModel}" placeholder="请输入${label}" input-align="left"></van-calendar></van-linear-layout></template>`;
+          formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-calendar :clearable="true" :value.sync="${vModel}" placeholder="请输入${label}" inputAlign="left"></van-calendar></van-linear-layout></template>`;
         } else if (propertyTypeName === 'Time') {
-          formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-datetime-picker type="time" v-model="${vModel}" title="请选择${label}" label-field="" input-align="left"></van-datetime-picker></van-linear-layout></template>`;
+          formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-datetime-picker type="time" v-model="${vModel}" title="请选择${label}" labelField="" inputAlign="left"></van-datetime-picker></van-linear-layout></template>`;
         } else if (propertyTypeName === 'DateTime') {
-          formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-datetime-picker type="datetime" v-model="${vModel}" title="请选择${label}" label-field="" input-align="left"></van-datetime-picker></van-linear-layout></template>`;
+          formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-datetime-picker type="datetime" v-model="${vModel}" title="请选择${label}" labelField="" inputAlign="left"></van-datetime-picker></van-linear-layout></template>`;
         } else {
           const namespaceArr = propertyTypeNamespace.split('.');
           const type = namespaceArr.pop();

package/src/templator/utils.ts

@@ -137,11 +137,11 @@ export function genUniqueQueryNameGroup(
   suffix: string = ''
 ) {
   const result: NameGroup = {};
-  result.viewLogicLoad = view.getLogicUniqueName(`load${defaultInView ? '' : capFirstLetter(componentName)}${suffix ? capFirstLetter(suffix) : ''}`);
-  result.logic = scope.getLogicUniqueName(
+  result.viewLogicLoad = view?.getLogicUniqueName?.(`load${defaultInView ? '' : capFirstLetter(componentName)}${suffix ? capFirstLetter(suffix) : ''}`);
+  result.logic = scope?.getLogicUniqueName?.(
     `load${capFirstLetter(view.name)}${componentName ? capFirstLetter(componentName) : ''}${suffix ? capFirstLetter(suffix) : ''}`
   );
-  result.structure = scope.getStructureUniqueName(utils.firstUpperCase(`${result.logic}Structure`));
+  result.structure = scope?.getStructureUniqueName?.(utils.firstUpperCase(`${result.logic}Structure`));
   return result;
 }
 
@@ -246,34 +246,14 @@ export const NaslTypeAnnotation = {
   }),
   AnonymousStructure: (properties: any[]) => ({
     concept: 'TypeAnnotation',
-    typeKind: 'anonymousStructure',
-    properties: [
-      {
-        concept: 'StructureProperty',
-        name: 'list',
-        typeAnnotation: {
-          concept: 'TypeAnnotation',
-          typeKind: 'generic',
-          typeName: 'List',
-          typeNamespace: 'nasl.collection',
-          typeArguments: [
-            {
-              concept: 'TypeAnnotation',
-              typeKind: 'anonymousStructure',
-              properties,
-            },
-          ],
-        },
-      },
+    typeKind: 'generic',
+    typeName: 'List',
+    typeNamespace: 'nasl.collection',
+    typeArguments: [
       {
-        concept: 'StructureProperty',
-        name: 'total',
-        typeAnnotation: {
-          concept: 'TypeAnnotation',
-          typeKind: 'primitive',
-          typeNamespace: 'nasl.core',
-          typeName: 'Long',
-        },
+        concept: 'TypeAnnotation',
+        typeKind: 'anonymousStructure',
+        properties,
       },
     ],
   }),
@@ -403,6 +383,17 @@ export const NaslLogicItem = {
     left,
     right,
   }),
+
+  // 分页
+  Paginate: ({ list, page, size }: { list: any, page: any; size: any }) => ({
+    concept: 'Paginate',
+    name: '',
+    kind: 'Expression',
+    label: '分页',
+    list,
+    page,
+    size,
+  }),
 };
 
 export const NaslQueryExpression = {

package/src/translator/types.ts

@@ -48,6 +48,10 @@ export interface TranslatorState {
   finalCode?: boolean;
   focusedNodePath?: string;
   getVuePrototype?: boolean;
+
+  noNeedParams?: boolean;
+  // CallLogic 节点翻译时不使用立即运行函数
+  callLogicNoIife?: boolean;
 }
 
 export type SourceMapItem = Range;

package/src/utils/index.ts

@@ -1,6 +1,7 @@
 import { compare } from 'compare-versions';
 import { BaseNode, LogicItem, AnonymousFunction, Param } from '..';
-import type { types, ForEachStatement, Logic, View } from '..';
+import type { ForEachStatement, Logic, View } from '..';
+import * as types from '../concepts/utils/types';
 import { getConceptPropertyMap } from '../decorators/index';
 import { traverse } from './traverse';
 // import TypeAnnotation from '../concepts/TypeAnnotation__';
@@ -154,7 +155,7 @@ export function toBriefExpr(expression: LogicItem): string {
   ) {
     expr = expression.toBrief();
   } else if (
-    ['CallFunction', 'CallLogic', 'CallInterface', 'CallQueryComponent', 'SqlQueryComponent', 'OqlQueryComponent'].includes(expression?.concept)
+    ['CallFunction', 'CallLogic', 'CallInterface', 'CallQueryComponent', 'SqlQueryComponent', 'OqlQueryComponent', 'Paginate'].includes(expression?.concept)
   ) {
     expr = expression.label;
   }
@@ -281,7 +282,41 @@ function getAnonymousFnNodes(node: types.SyntaxNode) {
  * 父链上存在的参数名字
  * @returns
  */
-function getAncestorExistingParamNames(baseNode: types.SyntaxNode) {
+export function getAncestorExistingParamNames(baseNode: types.SyntaxNode) {
+  let node: BaseNode = baseNode;
+  const names: Set<string> = new Set();
+  while (node) {
+    node = node.parentNode;
+    switch (node?.concept) {
+      case 'AnonymousFunction':
+        (node as AnonymousFunction).params.forEach((param: Param) => {
+          names.add(param.name);
+        });
+        break;
+      case 'ForEachStatement':
+        names.add((node as ForEachStatement).item?.name);
+        names.add((node as ForEachStatement).index?.name);
+        break;
+      case 'Logic':
+      case 'View':
+        const varList = [
+          ...((node as Logic | View).params || []),
+        ];
+        varList?.forEach((variable) => {
+          names.add(variable?.name);
+        });
+        break;
+    }
+  }
+  return names;
+}
+
+
+/**
+ * 父链上存在的变量名字
+ * @returns
+ */
+function getAncestorExistingVarNames(baseNode: types.SyntaxNode) {
   let node: BaseNode = baseNode;
   const names: Set<string> = new Set();
   while (node) {
@@ -350,7 +385,7 @@ export function checkParamNameOfAnonymousFunction(node: types.SyntaxNode) {
   const anonymousFnNodes: any = getAnonymousFnNodes(node);
   // 从外到里计算更改的name
   const paramInfoMapList = ensureAnonymousFnsParamName({
-    ancestorParamNames: getAncestorExistingParamNames(node),
+    ancestorParamNames: getAncestorExistingVarNames(node),
     anonymousFnNodes
   });
   paramInfoMapList?.forEach((paramInfoMap: Map<string, any>) => {
@@ -406,7 +441,7 @@ export function hasParamNameOfAnonymousFunction({
   node: types.SyntaxNode,
   newName: string
 }) {
-  const ancestorParamNames = getAncestorExistingParamNames(node);
+  const ancestorParamNames = getAncestorExistingVarNames(node);
   const anonymousFnNodesParams = collectAnonymousFnNodesParams(node);
   const paramNames = new Set([...ancestorParamNames.values(), ...anonymousFnNodesParams.values()]);
   return paramNames.has(newName);

package/src/utils/string.ts

@@ -5,6 +5,20 @@
  */
 export const kebab2Camel = (name: string) => name.replace(/(?:^|-)([a-zA-Z0-9])/g, (m, $1) => $1.toUpperCase());
 
+/**
+ * 中划线格式 转 驼峰格式  kebab-case -> CamelCase
+ * @param name 原名称
+ * @return 转换后的名称
+ */
+export const kebab2Pascal = (name: string) => name?.replace(/(?:^|-)([a-zA-Z0-9])/g, (m, $1) => $1.toUpperCase());
+
+/**
+ * 中划线格式 转 驼峰格式  ab-cd -> abCd
+ * @param name 原名称
+ * @return 转换后的名称
+ */
+export const kebab2Camel2 = (name: string) => name?.replace(/-(\w)/g, (m, $1) => $1.toUpperCase());
+
 /**
  * 下划线格式 转 驼峰格式  snake_case -> camelCase
  * @param name 原名称

package/src/utils/time-slicing/performance.ts

@@ -28,16 +28,16 @@ export class Performance {
   }
 
   mark(name: string) {
-    return performance.mark(this.getPerformanceId(name));
+    return performance?.mark?.(this.getPerformanceId(name));
   }
 
   measure(name: string, startMark: string, endMark: string) {
-    return performance.measure(this.getPerformanceId(name), this.getPerformanceId(startMark), this.getPerformanceId(endMark));
+    return performance?.measure?.(this.getPerformanceId(name), this.getPerformanceId(startMark), this.getPerformanceId(endMark));
   }
 
   clearByNames(...names: string[]) {
     for (const name of names) {
-      const entry = performance.getEntriesByName(this.getPerformanceId(name))[0];
+      const entry = performance?.getEntriesByName?.(this.getPerformanceId(name))[0];
 
       if (entry) {
         this.clearEntry(entry);

package/test/concepts/call-interface/__snapshots__/getQuickInfoOffset.spec.ts.snap

@@ -17,7 +17,7 @@ Object {
     new nasl.core.String('StringLiteral');
     function __newComposite() {
         let __obj = nasl.util.New<apis.a123456.structures.With_bodyBody>();
-        const { id, value, property1 } = __obj;
+        const { id: __id, value: __value, property1: __property1 } = __obj;
         __obj.id = new nasl.core.Long(1);
         __obj.value = new nasl.core.String('StringLiteral');
         __obj.property1 = new nasl.core.String('StringLiteral');