@lcap/nasl 3.2.0-beta.3 → 3.2.0-beta.4

package/src/generator/permission.ts

@@ -114,7 +114,7 @@ function findResourcesOfUI(view: View | ViewElement) {
 }
 
 function optimizeResourceData(resources: ResourceNode[][]) {
-    let res = removeRedundantResourceData(resources);
+    const res = removeRedundantResourceData(resources);
     return res
 }
 
@@ -240,28 +240,25 @@ function findUploaders(app: App) {
     return map;
 }
 function checkUploadAuth(uploaders: Map<string, ViewElement[]>) {
-    const res: ResourceNode[] = [];
-    // 如果开启控制权限-componet，没开启权限-page
-    uploaders.get('/upload')?.map(node => {
-        if (node instanceof ViewElement) {
-            if (node.auth) {
-                res.push({
-                    path: node.authPath,
-                    type: 'component',
-                });
-            } else {
-                res.push({
-                    path: `${node?.view?.path}`, // 当前页面的路径
-                    type: 'page',
-                });
-            }
-        }
-    })
-   return res;
+  const res: { key: string, authValue: ResourceNode[] }[] = [];
+  // 如果开启控制权限-component，没开启权限-page
+  uploaders.forEach((value, key) => {
+    const authValue: ResourceNode[] = []
+    value.map(node => {
+      if (node instanceof ViewElement) {
+        const path = node.auth ? node.authPath : `${node.view.path}`;
+        const type = node.auth ? 'component' : 'page';
+        authValue.push({ path, type });
+      }
+      return null;
+    });
+    res.push({ key, authValue });
+  });
+  return res;
 }
-function checkPageAndUploadAuth(uploaders: Map<string, ViewElement[]>) {
+function checkPageAndUploadAuth(uploaders: Map<string, ViewElement[]>, key: string) {
     let flag: number = -1;
-    flag = uploaders.get('/upload')?.findIndex(node => {
+    flag = uploaders.get(key)?.findIndex(node => {
         if (node.getAncestor('View') instanceof View) {
             // 当前页面未开启权限且文件上传组件也未开启权限
             if (!(node.getAncestor('View') as View).auth && node instanceof ViewElement && !node.auth) {
@@ -287,7 +284,10 @@ export async function genPermissionData(app: App) {
     }
     const authValue = checkUploadAuth(uploaders);
     if (authValue?.length) {
-        logicPageResourceDtoList['/upload:POST'] = [checkPageAndUploadAuth(uploaders) != -1 ? [] : authValue];
+        authValue.forEach((item) => {
+            const {key, authValue} = item;
+            logicPageResourceDtoList[`${key}:POST`] = [checkPageAndUploadAuth(uploaders, key) !== -1 ? [] : authValue];
+        });
     }
     closeCache();
     // console.timeEnd('xxx');

package/src/server/event.js

@@ -8,9 +8,9 @@ export const trigger = [
                 name: '$event',
                 type: 'MouseEvent',
                 description: '鼠标事件对象',
-                schema: { $ref: '#/systemTypes/MouseEvent' }
-            }
-        ]
+                schema: { $ref: '#/systemTypes/MouseEvent' },
+            },
+        ],
     },
     {
         name: 'dblclick',
@@ -21,9 +21,9 @@ export const trigger = [
                 name: '$event',
                 type: 'MouseEvent',
                 description: '鼠标事件对象',
-                schema: { $ref: '#/systemTypes/MouseEvent' }
-            }
-        ]
+                schema: { $ref: '#/systemTypes/MouseEvent' },
+            },
+        ],
     },
     {
         name: 'contextmenu',
@@ -34,9 +34,9 @@ export const trigger = [
                 name: '$event',
                 type: 'MouseEvent',
                 description: '鼠标事件对象',
-                schema: { $ref: '#/systemTypes/MouseEvent' }
-            }
-        ]
+                schema: { $ref: '#/systemTypes/MouseEvent' },
+            },
+        ],
     },
     {
         name: 'mousedown',
@@ -47,9 +47,9 @@ export const trigger = [
                 name: '$event',
                 type: 'MouseEvent',
                 description: '鼠标事件对象',
-                schema: { $ref: '#/systemTypes/MouseEvent' }
-            }
-        ]
+                schema: { $ref: '#/systemTypes/MouseEvent' },
+            },
+        ],
     },
     {
         name: 'mouseup',
@@ -60,9 +60,9 @@ export const trigger = [
                 name: '$event',
                 type: 'MouseEvent',
                 description: '鼠标事件对象',
-                schema: { $ref: '#/systemTypes/MouseEvent' }
-            }
-        ]
+                schema: { $ref: '#/systemTypes/MouseEvent' },
+            },
+        ],
     },
     {
         name: 'mouseenter',
@@ -73,9 +73,9 @@ export const trigger = [
                 name: '$event',
                 type: 'MouseEvent',
                 description: '鼠标事件对象',
-                schema: { $ref: '#/systemTypes/MouseEvent' }
-            }
-        ]
+                schema: { $ref: '#/systemTypes/MouseEvent' },
+            },
+        ],
     },
     {
         name: 'mouseleave',
@@ -86,9 +86,9 @@ export const trigger = [
                 name: '$event',
                 type: 'MouseEvent',
                 description: '鼠标事件对象',
-                schema: { $ref: '#/systemTypes/MouseEvent' }
-            }
-        ]
+                schema: { $ref: '#/systemTypes/MouseEvent' },
+            },
+        ],
     },
     {
         name: 'focus',
@@ -99,9 +99,9 @@ export const trigger = [
                 name: '$event',
                 type: 'FocusEvent',
                 description: '焦点事件对象',
-                schema: { $ref: '#/systemTypes/FocusEvent' }
-            }
-        ]
+                schema: { $ref: '#/systemTypes/FocusEvent' },
+            },
+        ],
     },
     {
         name: 'blur',
@@ -112,12 +112,36 @@ export const trigger = [
                 name: '$event',
                 type: 'FocusEvent',
                 description: '焦点事件对象',
-                schema: { $ref: '#/systemTypes/FocusEvent' }
-            }
-        ]
+                schema: { $ref: '#/systemTypes/FocusEvent' },
+            },
+        ],
+    },
+    {
+        name: 'keydown',
+        title: '键盘按下时',
+        params: [
+            {
+                name: '$event',
+                type: 'KeyboardEvent',
+                description: '键盘事件对象',
+                schema: { $ref: '#/systemTypes/KeyboardEvent' },
+            },
+        ],
+    },
+    {
+        name: 'keyup',
+        title: '键盘松开时',
+        params: [
+            {
+                name: '$event',
+                type: 'KeyboardEvent',
+                description: '键盘事件对象',
+                schema: { $ref: '#/systemTypes/KeyboardEvent' },
+            },
+        ],
     },
     { name: 'created', title: '进入时' },
     { name: 'mounted', title: '进入后' },
     { name: 'updated', title: '更新时' },
-    { name: 'destroyed', title: '离开时' }
+    { name: 'destroyed', title: '离开时' },
 ];

package/src/server/getLogics.ts

@@ -223,6 +223,8 @@ export async function getLogics(node: CallLogic | BindEvent| Identifier | Logic,
             });
             tree.expanded = false;
             result.push(tree);
+            const filteredBrowserLogics = stdlibNamespace.findChild('browser').logics.filter(item => item.name !== 'compareKeyboardInput');
+            const compareKeyboardInput = stdlibNamespace.findChild('browser').logics.find(item => item.name === 'compareKeyboardInput');
             const systemTree = new Namespace({
                 name: 'category',
                 path: `nasl`,
@@ -233,7 +235,7 @@ export async function getLogics(node: CallLogic | BindEvent| Identifier | Logic,
                         name: 'category',
                         path: `browser`,
                         title: '浏览器',
-                        logics: node?.frontend?.type === 'h5' ? stdlibNamespace.findChild('browser').logics.filter((item) => ['getDistance', 'getLocation', 'getIsMiniApp'].includes(item.name)) : stdlibNamespace.findChild('browser').logics.filter((item) => !['getDistance', 'getLocation', 'getIsMiniApp', 'navigateToUserInfo', 'getWeChatHeadImg', 'getWeChatNickName', 'getWeChatOpenid'].includes(item.name)),
+                        logics: node?.frontend?.type === 'h5' ? filteredBrowserLogics.filter((item) => ['getDistance', 'getLocation', 'getIsMiniApp'].includes(item.name)) : filteredBrowserLogics.filter((item) => !['getDistance', 'getLocation', 'getIsMiniApp', 'navigateToUserInfo', 'getWeChatHeadImg', 'getWeChatNickName', 'getWeChatOpenid'].includes(item.name)),
                         expanded: false,
                     }),
                     new Namespace({
@@ -253,6 +255,37 @@ export async function getLogics(node: CallLogic | BindEvent| Identifier | Logic,
                 ],
                 expanded: false,
             });
+
+            /**
+             * start
+             * 系统逻辑 - 事件逻辑
+             * 在绑定事件中，且event中支持事件逻辑时
+             */
+            // FIXME 先用白名单的方式支持
+            const { parentNode } = node;
+            const grandParentNode = parentNode?.parentNode;
+            if (grandParentNode.concept === 'BindEvent' && parentNode.concept === 'Logic'
+                && parentNode.virtualParams?.length
+                && ['KeyboardEvent'].includes(parentNode.virtualParams[0]?.__TypeAnnotation?.typeName)) {
+                systemTree.children[1].logics.push(compareKeyboardInput)
+            }
+
+            if (grandParentNode.concept === 'BindEvent' && parentNode.concept === 'Logic'
+                && parentNode.virtualParams?.length
+                && ['MouseEvent', 'KeyboardEvent'].includes(parentNode.virtualParams[0]?.__TypeAnnotation?.typeName)
+            ) {
+                systemTree.children.push(new Namespace({
+                    name: 'category',
+                    path: `event`,
+                    title: '事件逻辑',
+                    logics: stdlibNamespace.findChild('event').logics,
+                    expanded: false,
+                }))
+            }
+            /**
+             * end
+             */
+
             if (node?.frontend?.type === 'h5') {
                 systemTree.children.push(new Namespace({
                     name: 'category',

package/src/server/naslServer.ts

@@ -3707,11 +3707,15 @@ class NaslServer {
                 line: lsp2tspNumber(item.range.start.line),
                 offset: lsp2tspNumber(item.range.start.character),
             };
+
             // 位置计算偏移
-            if (node.concept === 'CallLogic' && (node as CallLogic).useIife) {
-                fileDetail.line += 2;
-                fileDetail.offset = 8;
-            } else if (
+            if ('getQuickInfoOffset' in node) {
+                Object.assign(fileDetail, (node as any).getQuickInfoOffset(fileDetail, item.code));
+            }
+
+            // 位置计算偏移2
+            // TODO: 之后考虑把这些偏移量计算全都挪到节点内部去
+            if (
                 node.concept === 'BinaryExpression' ||
                 node.concept === 'CallLogic' ||
                 node.concept === 'CallFunction' ||

package/src/server/naslStdlibMap.ts

@@ -19,6 +19,7 @@ if (globalThis.process) { // For TS build
         'nasl.logging.ts': fs.readFileSync(require.resolve('../../sandbox/stdlib/nasl.logging.ts'), 'utf8'),
         'nasl.io.ts': fs.readFileSync(require.resolve('../../sandbox/stdlib/nasl.io.ts'), 'utf8'),
         'nasl.oql.ts': fs.readFileSync(require.resolve('../../sandbox/stdlib/nasl.oql.ts'), 'utf8'),
+        'nasl.event.ts': fs.readFileSync(require.resolve('../../sandbox/stdlib/nasl.event.ts'), 'utf8'),
     };
 }
 /// #endif
@@ -41,6 +42,7 @@ if (globalThis.window) { // For TS build
         'nasl.logging.ts': require('!!raw-loader!../../sandbox/stdlib/nasl.logging.ts').default,
         'nasl.io.ts': require('!!raw-loader!../../sandbox/stdlib/nasl.io.ts').default,
         'nasl.oql.ts': require('!!raw-loader!../../sandbox/stdlib/nasl.oql.ts').default,
+        'nasl.event.ts': require('!!raw-loader!../../sandbox/stdlib/nasl.event.ts').default,
     };
 }
 /// #endif

package/src/templator/genCreateBlock.ts

@@ -70,7 +70,7 @@ export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
             } else if (propertyTypeName === 'Decimal') {
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
-            } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 255) {
+            } 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>`;

package/src/templator/genCurdEditMultipleKeyBlock.ts

@@ -74,7 +74,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
             } else if (propertyTypeName === 'Decimal') {
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
-            } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 255) {
+            } 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>`;
@@ -173,7 +173,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
             } else if (propertyTypeName === 'Decimal') {
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
-            } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 255) {
+            } 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>`;
@@ -318,7 +318,7 @@ export function genCurdEditMultipleKeyBlock(entity: Entity, oldNode: ViewElement
     return `<template>
     <u-linear-layout direction="vertical">
         ${genFilterTemplate(entity, nameGroup, selectNameGroupMap)}
-        ${genEditTableTemplate(entity, nameGroup, entityLogic, selectNameGroupMap, 'genCurdEditMultipleKeyBlock')}
+        ${genEditTableTemplate(entity, nameGroup, selectNameGroupMap)}
         ${genSaveModalTemplate(entity, nameGroup, selectNameGroupMap)}
     </u-linear-layout>
 </template>
@@ -438,7 +438,7 @@ export function genEditTableColumnComponent(app:App, entity: Entity, property: E
             formItem = `<u-number-input :value.sync="${valueExpression}" :precision="0" :step="0" placeholder="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
         } else if (propertyTypeName === 'Decimal') {
             formItem = `<u-number-input :value.sync="${valueExpression}" :precision="0" :step="0" placeholder="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
-        } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 255) {
+        } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 256) {
             formItem = `<u-validator placement="bottom" display="appear" @blur-valid="${nameGroup.viewLogicBlurUpdate}" style="width:100%">
             <u-textarea :value.sync="${valueExpression}" placeholder="请输入${label}" :autofocus="true" size="full"></u-textarea>
             </u-validator>`;

package/src/templator/genCurdMultipleKeyBlock.ts

@@ -68,7 +68,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
             } else if (propertyTypeName === 'Decimal') {
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
-            } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 255) {
+            } 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>`;
@@ -174,7 +174,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
             } else if (propertyTypeName === 'Decimal') {
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
                 }></u-number-input>`;
-            } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 255) {
+            } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 256) {
                 formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-textarea>`;
             } else if (propertyTypeName === 'Date') {
                 formItem += `<u-date-picker clearable :value.sync="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-date-picker>`;
@@ -485,7 +485,7 @@ export function genCurdMultipleKeyBlock(entity: Entity, oldNode: ViewElement) {
     return `<template>
     <u-linear-layout direction="vertical">
         ${genFilterTemplate(entity, nameGroup, selectNameGroupMap)}
-        ${genTableTemplate(entity, nameGroup, entityLogic, true, 'genCurdMultipleKeyBlock')}
+        ${genTableTemplate(entity, nameGroup, true)}
         ${genSaveModalTemplate(entity, nameGroup, selectNameGroupMap)}
     </u-linear-layout>
 </template>
@@ -609,7 +609,7 @@ export function genGridViewMultipleKeyBlock(entity: Entity, oldNode: ViewElement
     return `<template>
     <u-linear-layout direction="vertical">
         ${genFilterTemplate(entity, nameGroup, selectNameGroupMap)}
-        ${genGridViewTemplate(entity, nameGroup, entityLogic, true, 'genCurdMultipleKeyBlock')}
+        ${genGridViewTemplate(entity, nameGroup, true)}
         ${genSaveModalTemplate(entity, nameGroup, selectNameGroupMap)}
     </u-linear-layout>
 </template>

package/src/templator/genEditTableBlock.ts

@@ -70,7 +70,7 @@ export function genEditTableColumnTemplate(entity: Entity, property: EntityPrope
             formItem = `<u-number-input :value.sync="${valueExpression}" :precision="0" :step="0" placeholder="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
         } else if (propertyTypeName === 'Decimal') {
             formItem = `<u-number-input :value.sync="${valueExpression}" :precision="0" :step="0" placeholder="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
-        } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 255) {
+        } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 256) {
             formItem = `<u-validator placement="bottom" display="appear" @blur-valid="${nameGroup.viewLogicBlurUpdate}" style="width:100%">
             <u-textarea :value.sync="${valueExpression}" placeholder="请输入${label}" :autofocus="true" size="full"></u-textarea>
             </u-validator>`;
@@ -122,13 +122,10 @@ export function genEditTableColumnTemplate(entity: Entity, property: EntityPrope
  * @param entity 实体
  * @param nameGroup 命名组
  */
-export function genEditTableTemplate(entity: Entity, nameGroup: NameGroup, newLogic: any, selectNameGroupMap?: Map<string, NameGroup>, entryFromCall?:string) {
+export function genEditTableTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroupMap?: Map<string, NameGroup>) {
     const properties = entity.properties.filter(filterProperty('inTable'));
-    let dataSourceValue = `(params) => ${newLogic.name}(params.page,params.size,params.sort,params.order)`;
-    if (['genCurdEditMultipleKeyBlock'].includes(entryFromCall)) {
-        dataSourceValue = `(params) => ${newLogic.name}(params.page,params.size,params.sort,params.order,filter)`;
-    }
-    return `<u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" data-schema="${nameGroup.structure}"
+
+    return `<u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
         value-field="${nameGroup.viewVariableEntity}.id"
         :pagination="true" :show-sizer="true" :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>

package/src/templator/genGridViewBlock.ts

@@ -99,13 +99,10 @@ export function genH5GridViewCardTemplate(property: EntityProperty, nameGroup?:
  * @param entity 实体
  * @param nameGroup 命名组
  */
-export function genGridViewTemplate(entity: Entity, nameGroup: NameGroup, newLogic: any, modifyable?: boolean, entryFromCall?: string) {
+export function genGridViewTemplate(entity: Entity, nameGroup: NameGroup, modifyable?: boolean) {
+    const currentName = nameGroup.currentName || 'current';
     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}"
+    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"
@@ -131,13 +128,10 @@ export function genGridViewTemplate(entity: Entity, nameGroup: NameGroup, newLog
 `;
 }
 
-export function genH5GridViewTemplate(entity: Entity, nameGroup: NameGroup, newLogic: any, modifyable?: boolean, entryFromCall?: string) {
+export function genH5GridViewTemplate(entity: Entity, nameGroup: NameGroup) {
+    const currentName = nameGroup.currentName || 'current';
     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}"
+    return `<van-grid-view ref="gridView" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
     pageable="auto-more"
     :remote-paging="true"
     :col="2"
@@ -281,7 +275,7 @@ export function genGridViewBlock(entity: Entity, oldNode: ViewElement) {
 
     return `
 <template>
-    ${config.scope === 'h5' ? genH5GridViewTemplate(entity, nameGroup, entityLogic) : genGridViewTemplate(entity, nameGroup, entityLogic)}
+    ${config.scope === 'h5' ? genH5GridViewTemplate(entity, nameGroup) : genGridViewTemplate(entity, nameGroup)}
 </template>
 <definition>
 {
@@ -329,7 +323,7 @@ export function genGridViewCardBlock(property: EntityProperty, oldNode: ViewElem
 
     return `
     <template>
-        ${genGridViewTemplate(entity, nameGroup, entityLogic)}
+        ${genGridViewTemplate(entity, nameGroup)}
     </template>
     <definition>
     {

package/src/templator/genListViewBlock.ts

@@ -6,13 +6,12 @@ import {
     NameGroup, NaslUITypeAnnotation, NaslLogicItem, NaslNode,
 } from './utils';
 
-export function genListViewTemplate(property: EntityProperty, nameGroup: NameGroup, newLogic: any) {
+export function genListViewTemplate(property: EntityProperty, nameGroup: NameGroup) {
     const entity = property.entity;
     const lowerEntityName = utils.firstLowerCase(entity.name);
     const currentName = nameGroup.currentName || 'current';
     const valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
-    let dataSourceValue = `(params) => ${newLogic.name}(params.page, params.size)`;
-    return `<u-list-view ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" data-schema="${nameGroup.structure}"
+    return `<u-list-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
     text-field="${nameGroup.viewVariableEntity}.${property.name}"
     value-field="${nameGroup.viewVariableEntity}.id" :pageable="true" :remote-paging="true">
     <template #item="current">
@@ -23,13 +22,12 @@ export function genListViewTemplate(property: EntityProperty, nameGroup: NameGro
 </u-list-view>`;
 }
 
-export function genH5ListViewTemplate(property: EntityProperty, nameGroup: NameGroup, newLogic: any) {
+export function genH5ListViewTemplate(property: EntityProperty, nameGroup: NameGroup) {
     const entity = property.entity;
     const lowerEntityName = utils.firstLowerCase(entity.name);
     const currentName = nameGroup.currentName || 'current';
     const valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
-    let dataSourceValue = `(params) => ${newLogic.name}(params.page, params.size)`;
-    return `<van-list-view ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" data-schema="${nameGroup.structure}"
+    return `<van-list-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
     text-field="${nameGroup.viewVariableEntity}.${property.name}"
     value-field="${nameGroup.viewVariableEntity}.id" pageable="auto-more" :remote-paging="true">
     <template #item="current">
@@ -109,11 +107,8 @@ 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, entityLogic) : genListViewTemplate(displayedProperty, nameGroup, entityLogic)}
+    ${config.scope === 'h5' ? genH5ListViewTemplate(displayedProperty, nameGroup) : genListViewTemplate(displayedProperty, nameGroup)}
 </template>
 
 <definition>

package/src/templator/genSelectBlock.ts

@@ -13,15 +13,11 @@ import {
  * @param nameGroup
  * @returns
  */
-export function genSelectTemplate(property: EntityProperty, nameGroup: NameGroup, newLogic: any) {
-    let dataSourceValue = `(params) => ${newLogic.name}(params.page, params.size)`
-    return `<u-select clearable placeholder="请选择" 
-        ref="${nameGroup.viewElementMainView}" 
-        :data-source="${dataSourceValue}" 
-        data-schema="${nameGroup.structure}"
-        text-field="${nameGroup.lowerEntity}.${property.name}"
-        value-field="${nameGroup.lowerEntity}.id" :pageable="true" :remote-paging="true">
-    </u-select>`;
+export function genSelectTemplate(property: EntityProperty, nameGroup: NameGroup) {
+    return `<u-select clearable placeholder="请选择" ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
+    text-field="${nameGroup.lowerEntity}.${property.name}"
+    value-field="${nameGroup.lowerEntity}.id" :pageable="true" :remote-paging="true">
+</u-select>`;
 }
 
 /**
@@ -30,10 +26,9 @@ export function genSelectTemplate(property: EntityProperty, nameGroup: NameGroup
  * @param nameGroup
  * @returns
  */
-export function genH5SelectTemplate(property: EntityProperty, nameGroup: NameGroup, newLogic: any) {
+export function genH5SelectTemplate(property: EntityProperty, nameGroup: NameGroup) {
     const label = property.label || property.name;
-    let dataSourceValue = `(params) => ${newLogic.name}(params.page, params.size)`
-    return `<van-pickerson type="list" :show-toolbar="true" title="请选择" placeholder="请选择" ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" data-schema="${nameGroup.structure}"
+    return `<van-pickerson type="list" :show-toolbar="true" title="请选择" placeholder="请选择" ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
     text-field="${nameGroup.lowerEntity}.${property.name}"
     value-field="${nameGroup.lowerEntity}.id" :pageable="true" :remote-paging="true">
     <template #title>${label}</template>
@@ -48,7 +43,7 @@ export function genLoadSelectLogic(entity: Entity, nameGroup: NameGroup, newLogi
         genLogicParam(`${newLogic.params[1].name}`, 'params.size'),
     ];
     return NaslNode.Logic({
-        name: newLogic.name,
+        name: nameGroup.viewLogicLoad,
         params: [
             NaslNode.Param({
                 name: 'params',
@@ -105,9 +100,9 @@ export function genSelectBlock(entity: Entity, oldNode: ViewElement) {
     const newLogics: Array<any> = [
         newLogic,
     ];
+
     return `<template>
-    
-    ${config.scope === 'h5' ? genH5SelectTemplate(displayedProperty, nameGroup, newLogic) : genSelectTemplate(displayedProperty, nameGroup, newLogic)}
+    ${config.scope === 'h5' ? genH5SelectTemplate(displayedProperty, nameGroup) : genSelectTemplate(displayedProperty, nameGroup)}
 </template>
 
 <definition>

package/src/templator/genTableBlock.ts

@@ -57,14 +57,11 @@ export function genTableColumnTemplate(property: EntityProperty, currentName: st
  * @param entity 实体
  * @param nameGroup 命名组
  */
-export function genTableTemplate(entity: Entity, nameGroup: NameGroup, newLogic: any, modifyable?: boolean, entryFromCall?: string) {
+export function genTableTemplate(entity: Entity, nameGroup: NameGroup, modifyable?: boolean) {
     const currentName = nameGroup.currentName || 'current';
     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-table-view ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" data-schema="${nameGroup.structure}"
+
+    return `<u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
         value-field="${nameGroup.viewVariableEntity}.id"
         :pagination="true" :show-sizer="true">
     <u-table-view-column type="index" width="60"><template #title><u-text text="序号"></u-text></template><template #cell="current"></template></u-table-view-column>
@@ -212,7 +209,7 @@ export function genTableBlock(entity: Entity, oldNode: ViewElement) {
 
     return `
 <template>
-    ${genTableTemplate(entity, nameGroup, entityLogic)}
+    ${genTableTemplate(entity, nameGroup)}
 </template>
 <definition>
 {

package/src/templator/genUpdateBlock.ts

@@ -70,7 +70,7 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
             } else if (propertyTypeName === 'Decimal') {
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
-            } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 255) {
+            } 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>`;

package/src/templator/utils.ts

@@ -227,6 +227,8 @@ export const NaslUITypeAnnotation = {
     SortEvent: genNaslUITypeAnnotation('SortEvent'),
     PoiInfo: genNaslUITypeAnnotation('PoiInfo'),
     File: genNaslUITypeAnnotation('File'),
+    KeyboardEvent: genNaslUITypeAnnotation('KeyboardEvent'),
+
     Current: genNaslUIGenericTypeAnnotation('Current'),
     DragAndDropEvent: genNaslUIGenericTypeAnnotation('DragAndDropEvent'),
     ExpandEvent: genNaslUIGenericTypeAnnotation('ExpandEvent'),