@lcap/nasl 3.3.0-alpha.1 → 3.3.0-alpha.3

package/src/server/translator.ts

@@ -56,7 +56,6 @@ import { SourceMapItem } from '../translator';
 import { Diagnostic } from '../manager/diagnostic';
 import { sortTsString } from '../utils/sortTsString';
 import { getNodeByNodeCallee } from '../automate/engine/utils.js';
-
 export interface MinRange {
   node: BaseNode;
   item: SourceMapItem;
@@ -66,16 +65,16 @@ const mapAstString = new Map();
 
 function transformType(tsType: string): string {
   if (tsType === 'string' || tsType === 'String') return '字符串';
-  if (tsType === 'number') return '数字';
-  if (tsType === 'Integer') return '整数';
-  if (tsType === 'Double') return '小数';
-  if (tsType === 'Decimal') return '小数';
-  if (tsType === 'Long') return '整数';
-  if (tsType === 'DateTime') return '日期时间';
-  if (tsType === 'Date') return '日期';
-  if (tsType === 'Time') return '时间';
-  if (tsType === 'boolean' || tsType === 'Boolean') return '布尔值';
-  if (tsType === 'unknown') return '未知类型';
+  else if (tsType === 'number') return '数字';
+  else if (tsType === 'Integer') return '整数';
+  else if (tsType === 'Double') return '小数';
+  else if (tsType === 'Decimal') return '小数';
+  else if (tsType === 'Long') return '整数';
+  else if (tsType === 'DateTime') return '日期时间';
+  else if (tsType === 'Date') return '日期';
+  else if (tsType === 'Time') return '时间';
+  else if (tsType === 'boolean' || tsType === 'Boolean') return '布尔值';
+  else if (tsType === 'unknown') return '未知类型';
   else if (tsType === 'Enums') return '枚举';
   else if (tsType === 'views') return '页面';
   else if (tsType === 'void') return '无返回值';
@@ -143,12 +142,12 @@ function transformNamespace(tsNamespace: string): string {
 
 function transformMethod(tsMethod: string): string {
   if (tsMethod === 'forEach') return 'ForEach';
-  return tsMethod;
+  else return tsMethod;
 }
 
 function transformIdentifier(identifier: string): string {
   if (NAMESPACE_CONCEPT_MAP[identifier]) return NAMESPACE_CONCEPT_MAP[identifier];
-  return ` ${transformType(identifier)} 上的`;
+  else return ` ${transformType(identifier)} 上的`;
 }
 
 export function outOriginalvalue(value: string) {
@@ -298,6 +297,10 @@ const TS_RULES: Array<{
     re: /Cannot find name '__assignmentLineEmpty__'./,
     result: '批量赋值没有连线',
   },
+  {
+    re: /Cannot find name '__ValidationRule__'./,
+    result: '校验规则不能为空',
+  },
   {
     re: /No value exists in scope for the shorthand property '__(?:IDENTIFIER|LEFT|RIGHT)__'. Either declare one or provide an initializer./,
     result: '用户任务未关联页面',
@@ -473,14 +476,11 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
   if (node instanceof View || node instanceof ViewElement) {
     if (text.startsWith(`'nasl.ui' has no exported member named `)) {
       return null;
-    }
-    if (text.startsWith(`Property '`) && text.includes(`does not exist on type 'typeof ui'.`)) {
+    } else if (text.startsWith(`Property '`) && text.includes(`does not exist on type 'typeof ui'.`)) {
       return null;
-    }
-    if (text.startsWith(`Namespace 'nasl.ui' has no exported member `)) {
+    } else if (text.startsWith(`Namespace 'nasl.ui' has no exported member `)) {
       return null;
-    }
-    if (text.startsWith(`Function expression, which lacks return-type annotation, implicitly has an 'any[]' return type.`)) {
+    } else if (text.startsWith(`Function expression, which lacks return-type annotation, implicitly has an 'any[]' return type.`)) {
       return null;
     }
   }
@@ -600,7 +600,7 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
       node = parentNode || node;
 
       let str = tsErrorDetail.message;
-      str = `${(node as any).constructor.nodeTitle}：${str}`;
+      str = (node as any).constructor.nodeTitle + '：' + str;
       tsErrorDetail.message = str;
     }
   }
@@ -611,7 +611,7 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
       // node = node.parentNode;
       let str = tsErrorDetail.message;
       if (node) {
-        str = `${(node as any).parentNode.constructor.nodeTitle}：${str}`;
+        str = (node as any).parentNode.constructor.nodeTitle + '：' + str;
       }
       tsErrorDetail.message = str;
     }
@@ -623,7 +623,7 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
    */
   if (/^Cannot find name '__(?:IDENTIFIER|LEFT|RIGHT)__'\.$/.exec(text)) {
     if (node instanceof IfStatement || node instanceof SwitchCase || node instanceof WhileStatement) {
-      tsErrorDetail.message = `${(node as any).constructor.nodeTitle}：参数不能为空！所需类型：基础类型>布尔值`;
+      tsErrorDetail.message = (node as any).constructor.nodeTitle + '：参数不能为空！所需类型：基础类型>布尔值';
     } else if (node instanceof ForEachStatement) {
       tsErrorDetail.message = 'ForEach：结束值：不能为空！所需类型：基础类型>整数';
     } else if (node instanceof UnaryExpression) {
@@ -639,14 +639,14 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
     } else if ((node instanceof Argument && node.parentNode instanceof CallLogic) || node instanceof CallLogic) {
       tsErrorDetail.message = '调用逻辑：参数不能为空！';
     } else if (node instanceof ProcessOutcome || node instanceof Function || node instanceof MatchCase) {
-      tsErrorDetail.message = `${(node as any).constructor.nodeTitle}：不能为空！`;
+      tsErrorDetail.message = (node as any).constructor.nodeTitle + '：不能为空！';
     } else if (node instanceof NewMap) {
       tsErrorDetail.message = 'Map推导不出类型！请手动设置！';
     } else if (node instanceof NewList) {
       tsErrorDetail.message = 'List推导不出类型！请手动设置！';
     } else if (node instanceof Argument) {
       let str = tsErrorDetail.message;
-      str = `${(node.parentNode as any).constructor.nodeTitle}：${str}`;
+      str = (node.parentNode as any).constructor.nodeTitle + '：' + str;
       tsErrorDetail.message = str;
     } else if (node instanceof TypeAnnotation) {
       // 如果是TypeAnnotation 嵌套TypeAnnotation，就往上冒，多是那种T嵌套的
@@ -655,7 +655,7 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
       while (node.parentNode && node.parentNode instanceof TypeAnnotation) {
         node = node.parentNode;
       }
-      str = `${(node.parentNode as any).constructor.nodeTitle}：${str}`;
+      str = (node.parentNode as any).constructor.nodeTitle + '：' + str;
 
       tsErrorDetail.message = str;
     } else if (node instanceof Identifier) {
@@ -669,7 +669,7 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
         } else if (node.parentNode instanceof ValidationRule) {
           str = '验证逻辑：验证对象不能为空！';
         } else {
-          str = `${(node.parentNode as any).constructor.nodeTitle}：${str}`;
+          str = (node.parentNode as any).constructor.nodeTitle + '：' + str;
           tsErrorDetail.message = str;
         }
         return str;
@@ -705,7 +705,7 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
       }
     } else {
       let str = tsErrorDetail.message;
-      str = `${(node.parentNode as any).constructor.nodeTitle}：${str}`;
+      str = (node.parentNode as any).constructor.nodeTitle + '：' + str;
       tsErrorDetail.message = str;
       if (node.parentNode instanceof AnonymousFunction) {
         // 匿名函数：左右参数类型不一致！左边类型：布尔值，右边类型：整数。
@@ -773,8 +773,9 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
           const rightCode = oldStr[index + value.length] || '';
           if (/^[A-Za-z]+$/.test(leftCode) || /^[A-Za-z]+$/.test(rightCode)) {
             return value;
+          } else {
+            return rule.result;
           }
-          return rule.result;
         } catch (err) {
           return value;
         }
@@ -809,18 +810,18 @@ export function checkAStructure_(errorText: string) {
       const y = sortTsString(transformType(cap[2]));
       if (x === y) {
         return true;
-      }
-      if (mapAstString.get(x) === y || mapAstString.get(y) === x) {
-        return true;
-      }
-      const regex = /Type '"AStructure_(.*)' is not assignable to type '"AStructure_(.*)'/;
-      const nameError = regex.exec(errorText);
-      const length1 = x.match(/:/g) ? x.match(/:/g).length : -1;
-      const length2 = y.match(/:/g) ? y.match(/:/g).length : -2;
-      if (nameError && length1 === length2) {
-        mapAstString.set(x, y);
-        mapAstString.set(y, x);
+      } else if (mapAstString.get(x) === y || mapAstString.get(y) === x) {
         return true;
+      } else {
+        const regex = /Type '"AStructure_(.*)' is not assignable to type '"AStructure_(.*)'/;
+        const nameError = regex.exec(errorText);
+        const length1 = x.match(/:/g) ? x.match(/:/g).length : -1;
+        const length2 = y.match(/:/g) ? y.match(/:/g).length : -2;
+        if (nameError && length1 === length2) {
+          mapAstString.set(x, y);
+          mapAstString.set(y, x);
+          return true;
+        }
       }
     }
   }

package/src/service/defaultErrorMessage.json

@@ -1,15 +1,15 @@
 {
-    "required": "{label}不得为空",
-    "filled": "{label}不得为空",
-    "notEmpty": "{label}不得为空",
-    "empty": "{label}必须为空",
+    "required": "表单项不得为空",
+    "filled": "表单项不得为空",
+    "notEmpty": "表单项不得为空",
+    "empty": "表单项必须为空",
     "minLength": "不得少于{args}个字符",
     "maxLength": "不得超过{args}个字符",
     "rangeLength": "请输入{args}-{args}个字符",
     "min": "不能小于{args}",
     "max": "不能大于{args}",
     "range": "范围在{args}-{args}之间",
-    "pattern": "{label}格式不正确",
+    "pattern": "表单项格式不正确",
     "is": "必须与{args}相同",
     "isNot": "必须与{args}不同",
     "equals": "必须等于{args}",
@@ -19,7 +19,7 @@
     "excludes": "不能包含{args}",
     "included": "必须为{args}中的值",
     "excluded": "不能为{args}中的值",
-    "unique": "该{label}已经存在",
+    "unique": "该表单项已经存在",
     "noDuplicates": "不能出现重复项",
     "string": "请输入字符串",
     "number": "请输入数字",

package/src/service/storage/init.ts

@@ -127,6 +127,22 @@ function getMiniAppChange(target: any, obj: any, action: string) {
   }
 }
 
+let aiExecuted = 0;
+let sessionId = '';
+// AI 生成内容是否被采纳
+const handleAIPoint = (app: any, actionItem: any) => {
+  const { actionMsg, action } = actionItem || {};
+  if (aiExecuted > 0) {
+    app.emit('logic:accepted', { ...actionItem, sessionId });
+    aiExecuted -= 1;
+  }
+  if (actionMsg.includes('自然语言生成代码') && !action) {
+    aiExecuted += 1;
+    // eslint-disable-next-line prefer-destructuring
+    sessionId = actionMsg.match(/:(.*)/)[1];
+  }
+}
+
 /**
  *  执行更新
  */
@@ -135,6 +151,7 @@ async function doAction(app: any, actionItem: any) {
   let hasBackEnd = false;
   const actionList: any[] = [];
   const { list, actionMsg, action } = actionItem || {};
+  handleAIPoint(app, actionItem);
   const itemloop = (_i: LogicItem, app: any, diffArr: string[]) => {
     const _l = getStatement(_i, app, diffArr);
     if (_l.length) {

package/src/templator/genCreateBlock.ts

@@ -55,9 +55,10 @@ export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
               // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
               const key = [property.name, relationEntity.name].join('-');
               const selectNameGroup = selectNameGroupMap.get(key);
+              let dataSourceValue = `(params) => ${selectNameGroup.logic}(elements.$ce.page, elements.$ce.size)`
               formItem += `
-                        <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.viewLogicLoad}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" v-model="${vModel}">
+                        <u-select clearable placeholder="请选择${label}" :data-source="${dataSourceValue}" :page-size="50"
+                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
                         </u-select>
                     `;
             } else return '';
@@ -134,9 +135,10 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
               // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
               const key = [property.name, relationEntity.name].join('-');
               const selectNameGroup = selectNameGroupMap.get(key);
+              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="${selectNameGroup.viewLogicLoad}"
+                            v-model="${vModel}" :data-source="${dataSourceValue}" :page-size="50"
                             text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}"
                             :notitleblock="true"
                             :pageable="true" input-align="left" :remote-paging="true"></van-pickerson></van-linear-layout></template>

package/src/templator/genCurdEditMultipleKeyBlock.ts

@@ -58,9 +58,10 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
               // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
               const key = [property.name, relationEntity.name].join('-');
               const selectNameGroup = selectNameGroupMap.get(key);
+              let dataSourceValue = `(params) => ${selectNameGroup.logic}(elements.$ce.page, elements.$ce.size)`
               formItem += `
-                        <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.viewLogicLoad}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" v-model="${vModel}">
+                        <u-select clearable placeholder="请选择${label}" :data-source="${dataSourceValue}" :page-size="50"
+                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
                         </u-select>
                     `;
             } else return '';
@@ -161,9 +162,10 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
               // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
               const key = [property.name, relationEntity.name].join('-');
               const selectNameGroup = selectNameGroupMap.get(key);
+              let dataSourceValue = `(params) => ${selectNameGroup.logic}(elements.$ce.page, elements.$ce.size)`
               formItem += `
-                        <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.load}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" v-model="${vModel}">
+                        <u-select clearable placeholder="请选择${label}" :data-source="${dataSourceValue}" :page-size="50"
+                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
                         </u-select>
                     `;
             } else return '';
@@ -325,7 +327,7 @@ export function genCurdEditMultipleKeyBlock(entity: Entity, oldNode: ViewElement
   return `<template>
     <u-linear-layout direction="vertical">
         ${genFilterTemplate(entity, nameGroup, selectNameGroupMap)}
-        ${genEditTableTemplate(entity, nameGroup, selectNameGroupMap)}
+        ${genEditTableTemplate(entity, nameGroup, entityLogic, selectNameGroupMap, 'genCurdEditMultipleKeyBlock')}
         ${genSaveModalTemplate(entity, nameGroup, selectNameGroupMap)}
     </u-linear-layout>
 </template>
@@ -427,6 +429,7 @@ export function genEditTableColumnComponent(app: App, entity: Entity, property:
             viewLogicLoad: nameGroup.viewElementSelectLogic,
             viewElementSelect: '',
           };
+          let dataSourceValue = selectNameGroup.viewLogicLoad
           if (!nameGroup.viewElementSelectLogic) {
             const viewElementSelect = view.getViewElementUniqueName('select');
             const selectNameGroup = genUniqueQueryNameGroup(module, view, viewElementSelect, false, relationEntity.name);
@@ -434,11 +437,12 @@ export function genEditTableColumnComponent(app: App, entity: Entity, property:
             const newLogic = genQueryLogic([relationEntity], selectNameGroup, false, false, module);
             newLogics.push(newLogic);
             newLoadSelectLogics.push(genLoadSelectLogic(relationEntity, selectNameGroup, newLogic));
+            dataSourceValue = `(params) => ${selectNameGroup.viewLogicLoad}(elements.$ce.page, elements.$ce.size)`
           }
           formItem += `
-                        <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.viewLogicLoad}"
+                        <u-select clearable placeholder="请选择${label}" :data-source="${dataSourceValue}" :page-size="50"
                             :autofocus="true" :opened="true" append-to="body" @blur="${nameGroup.viewLogicBlurUpdate}" @select="${nameGroup.viewLogicBlurUpdate}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" :value.sync="${valueExpression}">
+                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" :value.sync="${valueExpression}">
                         </u-select>
                     `;
         } else return '';
@@ -474,7 +478,7 @@ export function genEditTableColumnComponent(app: App, entity: Entity, property:
         const name = enumeration?.name || '';
         const enumTypeAnnotationStr = `__enumTypeAnnotation_${namespace}.${name}`;
         formItem += `<u-select clearable
-                :data-source="$utils.EnumToList('${enumTypeAnnotationStr}')"
+                :data-source="$utils.EnumToList('${enumTypeAnnotationStr}')" :page-size="50"
                 :value.sync="${valueExpression}" placeholder="请输入${label}"
                 :autofocus="true" :opened="true" append-to="body" @blur="${nameGroup.viewLogicBlurUpdate}" @select="${nameGroup.viewLogicBlurUpdate}">
                 </u-select>`;

package/src/templator/genCurdMultipleKeyBlock.ts

@@ -57,9 +57,10 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
               // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
               const key = [property.name, relationEntity.name].join('-');
               const selectNameGroup = selectNameGroupMap.get(key);
+              let dataSourceValue = `(params) => ${selectNameGroup.logic}(elements.$ce.page, elements.$ce.size)`
               formItem += `
-                        <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.viewLogicLoad}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" v-model="${vModel}">
+                        <u-select clearable placeholder="请选择${label}" :data-source="${dataSourceValue}" :page-size="50"
+                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
                         </u-select>
                     `;
             } else return '';
@@ -158,13 +159,13 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
               // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
               const key = [property.name, relationEntity.name].join('-');
               const selectNameGroup = selectNameGroupMap.get(key);
+              let dataSourceValue = `(params) => ${selectNameGroup.logic}(elements.$ce.page, elements.$ce.size)`
               formItem += `
                         <u-select clearable placeholder="请选择${label}"
                             text-field="${lowerEntityName}.${displayedProperty.name}"
                             value-field="${lowerEntityName}.${relationProperty.name}"
-                            :data-source="${selectNameGroup.viewLogicLoad}"
-                            :pageable="true"
-                            :remote-paging="true"
+                            :data-source="${dataSourceValue}" :page-size="50"
+                            :pagination="true"
                             ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}
                             v-model="${vModel}">
                         </u-select>
@@ -507,7 +508,7 @@ export function genCurdMultipleKeyBlock(entity: Entity, oldNode: ViewElement) {
   return `<template>
     <u-linear-layout direction="vertical">
         ${genFilterTemplate(entity, nameGroup, selectNameGroupMap)}
-        ${genTableTemplate(entity, nameGroup, true)}
+        ${genTableTemplate(entity, nameGroup, entityLogic, true, 'genCurdMultipleKeyBlock')}
         ${genSaveModalTemplate(entity, nameGroup, selectNameGroupMap)}
     </u-linear-layout>
 </template>
@@ -635,7 +636,7 @@ export function genGridViewMultipleKeyBlock(entity: Entity, oldNode: ViewElement
   return `<template>
     <u-linear-layout direction="vertical">
         ${genFilterTemplate(entity, nameGroup, selectNameGroupMap)}
-        ${genGridViewTemplate(entity, nameGroup, true)}
+        ${genTableTemplate(entity, nameGroup, entityLogic, true, 'genCurdMultipleKeyBlock')}
         ${genSaveModalTemplate(entity, nameGroup, selectNameGroupMap)}
     </u-linear-layout>
 </template>

package/src/templator/genEditTableBlock.ts

@@ -63,10 +63,12 @@ export function genEditTableColumnTemplate(
           // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
           const key = [property.name, relationEntity.name].join('-');
           const selectNameGroup = selectNameGroupMap.get(key);
+          let dataSourceValue = `(params) => ${selectNameGroup.logic}(elements.$ce.page, elements.$ce.size)`
+          debugger
           formItem += `
-                        <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.viewLogicLoad}"
+                        <u-select clearable placeholder="请选择${label}" :data-source="${dataSourceValue}" :page-size="50"
                             :autofocus="true" :opened="true" append-to="body" @blur="${nameGroup.viewLogicBlurUpdate}" @select="${nameGroup.viewLogicBlurUpdate}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" :value.sync="${valueExpression}">
+                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" :value.sync="${valueExpression}">
                         </u-select>
                     `;
         } else return '';
@@ -102,7 +104,7 @@ export function genEditTableColumnTemplate(
         const name = enumeration?.name || '';
         const enumTypeAnnotationStr = `__enumTypeAnnotation_${namespace}.${name}`;
         formItem += `<u-select clearable
-                :data-source="$utils.EnumToList('${enumTypeAnnotationStr}')"
+                :data-source="$utils.EnumToList('${enumTypeAnnotationStr}')" :page-size="50"
                 :value.sync="${valueExpression}" placeholder="请输入${label}"
                 :autofocus="true" :opened="true" append-to="body" @blur="${nameGroup.viewLogicBlurUpdate}" @select="${nameGroup.viewLogicBlurUpdate}">
                 </u-select>`;
@@ -135,12 +137,15 @@ export function genEditTableColumnTemplate(
  * @param entity 实体
  * @param nameGroup 命名组
  */
-export function genEditTableTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroupMap?: Map<string, NameGroup>) {
+export function genEditTableTemplate(entity: Entity, nameGroup: NameGroup, newLogic: any, selectNameGroupMap?: Map<string, NameGroup>, entryFromCall?:string) {
   const properties = entity.properties.filter(filterProperty('inTable'));
-
-  return `<u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
+  let dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page,elements.$ce.size,elements.$ce.sort,elements.$ce.order)`;
+  if (['genCurdEditMultipleKeyBlock'].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" :default-column-width="300" editable>
+        :pagination="true" :show-sizer="true" :page-size="20" :page-number="1" :default-column-width="300" editable>
     <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) => `${genEditTableColumnTemplate(entity, property, nameGroup, selectNameGroupMap)}\n`).join('')}

package/src/templator/genEnumSelectBlock.ts

@@ -16,14 +16,14 @@ export function genEnumSelectBlock(enumeration: Enum, vModel?: string, size?: st
     return `<van-pickerson type="list" :show-toolbar="true" ${vModel ? ` v-model="${vModel}"` : ''}${
       placeholder ? ` title="${placeholder}" placeholder="${placeholder}"` : ''
     }
-        :data-source="$utils.EnumToList('${enumTypeAnnotationStr}')" :notitleblock="${hiddenAll}"><template #title>${
+        :data-source="$utils.EnumToList('${enumTypeAnnotationStr}')" :page-size="50" :notitleblock="${hiddenAll}"><template #title>${
           !hiddenAll ? placeholder || '' : ''
         }</template></van-pickerson>`;
 
   return `<u-select clearable${vModel ? ` v-model="${vModel}"` : ''}${size ? ` size="${size}"` : ''}${
     placeholder ? ` placeholder="${placeholder}"` : ''
   }
-            :data-source="$utils.EnumToList('${enumTypeAnnotationStr}')">
+            :data-source="$utils.EnumToList('${enumTypeAnnotationStr}')" :page-size="50">
                 ${hiddenAll ? '' : '<u-select-item text="全部"></u-select-item>'}
             </u-select>`;
 }

package/src/templator/genGetBlock.ts

@@ -58,12 +58,12 @@ export function genH5GetTemplate(entity: Entity, nameGroup: NameGroup) {
         const temptitle = property.label || property.name;
         let formItem = `            <van-cell isLink`;
 
-        formItem += ' :value="' + `${nameGroup.viewVariableEntity}.${property.name}` + '">';
-        formItem += `<template  #title>${temptitle}</template>`;
-        formItem += `<template>{{ ${`${nameGroup.viewVariableEntity}.${property.name}`} }}</template>            </van-cell>\n`;
-        return formItem;
-      })
-      .join('')}
+                formItem += ' :value="' + `${nameGroup.viewVariableEntity}.${property.name}` + '">';
+                formItem += `<template  #title>${temptitle}</template>`;
+                formItem += `{{ ${`${nameGroup.viewVariableEntity}.${property.name}`} }}            </van-cell>\n`;
+                return formItem;
+            })
+            .join('')}
 </van-cell-group>`;
 }
 

package/src/templator/genGridViewBlock.ts

@@ -93,12 +93,17 @@ export function genH5GridViewCardTemplate(property: EntityProperty, nameGroup?:
  * @param entity 实体
  * @param nameGroup 命名组
  */
-export function genGridViewTemplate(entity: Entity, nameGroup: NameGroup, modifyable?: boolean) {
+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'));
-  return `<u-grid-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
+  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})`;
+  }
+  return `<u-grid-view ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" data-schema="${nameGroup.structure}"
         value-field="${nameGroup.viewVariableEntity}.id"
-        :page-size="20"
+        :page-size="50"
+        :page-number="1"
         :pageable="true"
         :remote-paging="true"
         :show-sizer="true"
@@ -122,11 +127,17 @@ export function genGridViewTemplate(entity: Entity, nameGroup: NameGroup, modify
 `;
 }
 
-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}"
+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)`;
+    if (['genCurdMultipleKeyBlock'].includes(entryFromCall)) {
+      dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size,elements.$ce.sort,elements.$ce.order,${nameGroup.viewVariableFilter})`;
+    }
+    return `<van-grid-view ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" data-schema="${nameGroup.structure}"
     pageable="auto-more"
+    :page-size="50"
+    :page-number="1"
     :remote-paging="true"
     :col="2"
     :iffall="false">
@@ -243,6 +254,7 @@ export function genGridViewBlock(entity: Entity, oldNode: ViewElement) {
   nameGroup.viewElementMainView = viewElementMainView;
   nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
   nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
+  nameGroup.viewVariableFilter = view.getVariableUniqueName('filter');
 
   // 当前节点的currentName
   nameGroup.currentName = oldNode.getCurrentName();
@@ -266,7 +278,7 @@ export function genGridViewBlock(entity: Entity, oldNode: ViewElement) {
 
   return `
 <template>
-    ${config.scope === 'h5' ? genH5GridViewTemplate(entity, nameGroup) : genGridViewTemplate(entity, nameGroup)}
+    ${config.scope === 'h5' ? genH5GridViewTemplate(entity, nameGroup, entityLogic) : genGridViewTemplate(entity, nameGroup, entityLogic)}
 </template>
 <definition>
 {
@@ -292,6 +304,7 @@ export function genGridViewCardBlock(property: EntityProperty, oldNode: ViewElem
   nameGroup.viewElementMainView = viewElementMainView;
   nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
   nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
+  nameGroup.viewVariableFilter = view.getVariableUniqueName('filter');
 
   // 收集所有和本实体关联的实体
   const entitySet: Set<Entity> = new Set();
@@ -313,7 +326,7 @@ export function genGridViewCardBlock(property: EntityProperty, oldNode: ViewElem
 
   return `
     <template>
-        ${genGridViewTemplate(entity, nameGroup)}
+        ${genGridViewTemplate(entity, nameGroup, entityLogic)}
     </template>
     <definition>
     {

package/src/templator/genListViewBlock.ts

@@ -4,12 +4,15 @@ import { App, Module, Namespace, Entity, EntityProperty, DataSource, ViewElement
 import { genUniqueQueryNameGroup, getFirstDisplayedProperty, genQueryLogic, genLogicParam } from '.';
 import { NameGroup, NaslUITypeAnnotation, NaslLogicItem, NaslNode } from './utils';
 
-export function genListViewTemplate(property: EntityProperty, nameGroup: NameGroup) {
+export function genListViewTemplate(property: EntityProperty, nameGroup: NameGroup, newLogic: any) {
   const { entity } = property;
   const lowerEntityName = utils.firstLowerCase(entity.name);
   const currentName = nameGroup.currentName || 'current';
   const valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
-  return `<u-list-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
+  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">
     <template #item="current">
@@ -20,12 +23,15 @@ export function genListViewTemplate(property: EntityProperty, nameGroup: NameGro
 </u-list-view>`;
 }
 
-export function genH5ListViewTemplate(property: EntityProperty, nameGroup: NameGroup) {
+export function genH5ListViewTemplate(property: EntityProperty, nameGroup: NameGroup, newLogic: any) {
   const { entity } = property;
   const lowerEntityName = utils.firstLowerCase(entity.name);
   const currentName = nameGroup.currentName || 'current';
   const valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
-  return `<van-list-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
+  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">
     <template #item="current">
@@ -102,8 +108,11 @@ export function genListViewBlock(entity: Entity, oldNode: ViewElement, property:
 
   const newLogics: Array<any> = [];
 
+  const parentNode = entity.parentNode as App | Module | Namespace;
+  const entityLogic = genQueryLogic([entity], nameGroup, false, false, parentNode);
+
   return `<template>
-    ${config.scope === 'h5' ? genH5ListViewTemplate(displayedProperty, nameGroup) : genListViewTemplate(displayedProperty, nameGroup)}
+    ${config.scope === 'h5' ? genH5ListViewTemplate(displayedProperty, nameGroup, entityLogic) : genListViewTemplate(displayedProperty, nameGroup, entityLogic)}
 </template>
 
 <definition>