@lcap/nasl 2.20.1-beta.1 → 2.20.1-beta.2

package/sandbox/stdlib/nasl.oql.ts

@@ -295,12 +295,16 @@ declare namespace nasl.oql {
     export function MAX(value: nasl.core.Double): nasl.core.Double;
     export function MAX(value: nasl.core.Decimal): nasl.core.Decimal;
     export function MAX(value: nasl.core.Date): nasl.core.Date;
+    export function MAX(value: nasl.core.DateTime): nasl.core.DateTime;
+    export function MAX(value: nasl.core.Time): nasl.core.Time;
     export function MAX(value: nasl.core.Boolean): nasl.core.Boolean;
     export function MIN(value: nasl.core.Integer): nasl.core.Integer;
     export function MIN(value: nasl.core.Long): nasl.core.Long;
     export function MIN(value: nasl.core.Double): nasl.core.Double;
     export function MIN(value: nasl.core.Decimal): nasl.core.Decimal;
     export function MIN(value: nasl.core.Date): nasl.core.Date;
+    export function MIN(value: nasl.core.DateTime): nasl.core.DateTime;
+    export function MIN(value: nasl.core.Time): nasl.core.Time;
     export function MIN(value: nasl.core.Boolean): nasl.core.Boolean;
 
     // self

package/src/bak/translator.js

@@ -76,9 +76,9 @@ export default function (definition) {
 
     let viewExpressionMethods;
     if (hasViewExpressions) {
-        viewExpressions.forEach((viewExpression) => {
-            viewVariablesData.push(`${safeCodeAsKey(viewExpression.expressionNameInView)}: undefined`);
-        });
+        //viewExpressions.forEach((viewExpression) => {
+        //    viewVariablesData.push(`${safeCodeAsKey(viewExpression.expressionNameInView)}: undefined`);
+        //});
         viewExpressionMethods = (viewExpressions).map((viewExpression) =>
             viewExpression.getInViewMethod({
                 tabSize: 1,

package/src/concepts/BindAttribute__.ts

@@ -815,12 +815,13 @@ export class BindAttribute extends BaseNode {
                 let memberExpressionNode = node?.parentNode;
                 while (memberExpressionNode?.concept === 'MemberExpression') {
                     expressionNode = memberExpressionNode;
+                    // 为了处理MemberExpression里面存在CallLogic、CallFunction等的情况
                     const { concept: objConcept } = memberExpressionNode.object || {};
                     if (!['MemberExpression', 'Identifier'].includes(objConcept)) {
                         memberExpressionNode = null;
                         expressionNode = null;
                     } else {
-                        memberExpressionNode = memberExpressionNode.object;
+                        memberExpressionNode = memberExpressionNode.parentNode;
                     }
                 }
                 if (expressionNode) {
@@ -926,10 +927,11 @@ export class BindAttribute extends BaseNode {
         let value = this.value;
         if (this.type === 'dynamic' || (this.name === 'rules' && this.rules)) {
             // 需要用标识符替换
-            if (options?.finalCode !== false && this.needReplaceWithIdentifier) {
-                const argsList = this.getArgsList();
-                value = `${this.expressionBuilderName}(${argsList.join(', ')})`;
-            } else if (this.name === 'rules' && this.rules) {
+            //if (options?.finalCode !== false && this.needReplaceWithIdentifier) {
+            //    const argsList = this.getArgsList();
+            //    value = `${this.expressionBuilderName}(${argsList.join(', ')})`;
+            //} else 
+            if (this.name === 'rules' && this.rules) {
                 const ruleStrs = this.rules.map((rule) => rule.toVue(options));
                 value = `[${ruleStrs.join(' , ')}]`;
             } else if (['destination', 'externalDestination'].includes(this.name)) {

package/src/concepts/BindDirective__.ts

@@ -416,12 +416,13 @@ export class BindDirective extends BaseNode {
                 let memberExpressionNode = node?.parentNode;
                 while (memberExpressionNode?.concept === 'MemberExpression') {
                     expressionNode = memberExpressionNode;
+                    // 为了处理MemberExpression里面存在CallLogic、CallFunction等的情况
                     const { concept: objConcept } = memberExpressionNode.object || {};
                     if (!['MemberExpression', 'Identifier'].includes(objConcept)) {
                         memberExpressionNode = null;
                         expressionNode = null;
                     } else {
-                        memberExpressionNode = memberExpressionNode.object;
+                        memberExpressionNode = memberExpressionNode.parentNode;
                     }
                 }
                 if (expressionNode) {
@@ -518,10 +519,11 @@ export class BindDirective extends BaseNode {
         // eslint-disable-next-line no-nested-ternary
         let value = (this.type ?? 'string') !== 'string' ? this.value : this.value ? `'${this.value}'` : '';
         // 需要用标识符替换
-        if (options.finalCode !== false && this.needReplaceWithIdentifier) {
-            const argsList = this.getArgsList();
-            value = `${this.expressionBuilderName}(${argsList.join(', ')})`;
-        } else if (this.expression) {
+        //if (options.finalCode !== false && this.needReplaceWithIdentifier) {
+        //    const argsList = this.getArgsList();
+        //    value = `${this.expressionBuilderName}(${argsList.join(', ')})`;
+        //} else 
+        if (this.expression) {
             value = this.expression.toVue(options);
             if (this.expression.concept === 'StringLiteral') {
                 value = `${value}`;

package/src/concepts/BindStyle__.ts

@@ -372,12 +372,13 @@ export class BindStyle extends BaseNode {
                 let memberExpressionNode = node?.parentNode;
                 while (memberExpressionNode?.concept === 'MemberExpression') {
                     expressionNode = memberExpressionNode;
+                    // 为了处理MemberExpression里面存在CallLogic、CallFunction等的情况
                     const { concept: objConcept } = memberExpressionNode.object || {};
                     if (!['MemberExpression', 'Identifier'].includes(objConcept)) {
                         memberExpressionNode = null;
                         expressionNode = null;
                     } else {
-                        memberExpressionNode = memberExpressionNode.object;
+                        memberExpressionNode = memberExpressionNode.parentNode;
                     }
                 }
                 if (expressionNode) {
@@ -472,14 +473,14 @@ export class BindStyle extends BaseNode {
     toVue(options?: ElementToVueOptions) {
         let value: string;
         // 需要用标识符替换
-        if (options?.finalCode !== false && this.needReplaceWithIdentifier) {
-            const argsList = this.getArgsList();
-            value = `${this.expressionBuilderName} (${argsList.join(', ')})`;
-        } else {
+        //if (options?.finalCode !== false && this.needReplaceWithIdentifier) {
+        //    const argsList = this.getArgsList();
+        //    value = `${this.expressionBuilderName} (${argsList.join(', ')})`;
+        //} else {
             value = this.expression?.toVue(options);
             if (this.name?.endsWith('background-image') && value)
                 value = `\`url(\${${value}})\``;
-        }
+        //}
         return value && `'${this.name}': ${value}`;
     }
 

package/src/concepts/CallLogic__.ts

@@ -534,7 +534,7 @@ export class CallLogic extends LogicItem {
         if (typeof argIndex === 'number') {
             if (!this.arguments[argIndex]?.expression) {
                 // 如果本身没有值就直接删除
-                return this.arguments[argIndex].delete();
+                return this.arguments[argIndex]?.delete();
             }
             if (argIndex !== this.arguments.length - 1) {
                 this.arguments[argIndex]?.moveNode({

package/src/concepts/ConfigGroup__.ts

@@ -1,3 +1,5 @@
+import Namespace from './Namespace__';
+
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -11,8 +13,6 @@ import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import ConfigProperty from './ConfigProperty__';
 import App from './App__';
-import Namespace from './Namespace__';
-import Configuration from './Configuration__';
 
 /**
  * 配置组

package/src/concepts/DataSource__.ts

@@ -94,7 +94,7 @@ export class DataSource extends BaseNode {
         });
     }
 
-        getEntityExistingNames(excludedList: Array<Entity> = []) {
+    getEntityExistingNames(excludedList: Array<Entity> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.entities as Entity[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -235,9 +235,6 @@ export class DataSource extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除实体
     * @param name 实体名称
@@ -422,13 +419,20 @@ export class DataSource extends BaseNode {
             if (!prop.value) {
                 return;
             }
-            const dataSource = configProperty.name;
+            let isRecycled = false;
+            try {
+                const value = JSON.parse(prop.value);
+                // 被回收的数据库不需要 Ping
+                if (value.dataBaseMode === 'Platform_Generation' && value.status === 1) {
+                    isRecycled = true;
+                }
+            } catch (e) {}
             const env = prop.env;
-            return datasourceService.pingDatabase({
+            return isRecycled ? Promise.resolve() : datasourceService.pingDatabase({
                 body: {
                     category: 'sql',
                     appId: this.app.id,
-                    dataSource,
+                    dataSource: configProperty.name,
                     env,
                 },
             }).then(() => {

package/src/concepts/Destination__.ts

@@ -599,7 +599,7 @@ export class Destination extends LogicItem {
          */
         if (typeof argIndex === 'number') {
             if (!this.arguments[argIndex]?.expression) {
-                return this.arguments[argIndex].delete();
+                return this.arguments[argIndex]?.delete();
             }
             if (argIndex !== this.arguments.length - 1) {
                 // 如果本身没有值就直接删除

package/src/concepts/Logic__.ts

@@ -1712,11 +1712,11 @@ export class Logic extends BaseNode {
                         }
                     }
                 });
-            } else if (['NewList', 'NewMap'].includes(assignment.right.concept) && !(assignment.right as any).typeAnnotation) {
+            } else if (['NewList', 'NewMap'].includes(assignment.right?.concept) && !(assignment.right as any)?.typeAnnotation) {
                 const rightNode: any = assignment.right;
                 code += ' = ';
                 code += rightNode.getInitCode(shiftState(state, code, { inline: true }));
-            } else if (assignment.right.concept === 'NewComposite' && (assignment.right as any).typeAnnotation?.typeKind === 'anonymousStructure') {
+            } else if (assignment.right?.concept === 'NewComposite' && (assignment.right as any)?.typeAnnotation?.typeKind === 'anonymousStructure') {
                 const rightNode: any = assignment.right;
                 code += ' = ';
                 code += rightNode.getInitCode(shiftState(state, code, { inline: true }));

package/src/concepts/Match__.ts

@@ -438,10 +438,69 @@ export class Match extends LogicItem {
         this.emit('change', $event);
     }
 
+
+    // 获取在页面中的名字
+    get expressionNameInView() {
+        const nameList: string[] = [];
+        let node: BaseNode = this;
+        while (node) {
+            if (node === this) {
+                nameList.unshift('viewMatchExpression');
+            } else {
+                nameList.unshift(node.name);
+            }
+            if (node.concept === 'ViewElement') {
+                node = null;
+            } else {
+                nameList.unshift(node.parentKey);
+                node = node.parentNode;
+            }
+        }
+        return nameList.join('_').replace(/-/g, '_');
+    }
+
+    getViewMatchExpressionBuilder() {
+        return `gen${this.expressionNameInView}`;
+    }
+
+    getInViewMethod(state?: TranslatorState) {
+        const viewElement = this?.getAncestor('ViewElement');
+        const argsList = [];
+        let parent = viewElement?.parentNode;
+        let index = 0;
+        while (parent && parent.concept !== 'View') {
+            if ((parent as ViewElement).slotScope) {
+                argsList.unshift(index === 0 ? 'current' : 'current' + index);
+                index++;
+            }
+            parent = parent.parentNode;
+        }
+
+        let code = '';
+        code += `${this.getViewMatchExpressionBuilder()} (${argsList.join(', ')}) {\n`;
+        code += `return ${this.toJS()}`;
+        code += `;\n`;
+        code += '}';
+        return code;
+    }
+
     toVue(state?: TranslatorState): string {
         if (state?.finalCode === false) {
             return this.toUI();
         } else {
+            const viewElement = this?.getAncestor('ViewElement');
+            const argsList = [];
+            let parent = viewElement?.parentNode;
+            let index = 0;
+            while (parent && parent.concept !== 'View') {
+                if ((parent as ViewElement).slotScope) {
+                    argsList.unshift(index === 0 ? 'current' : 'current' + index);
+                    index++;
+                }
+                parent = parent.parentNode;
+            }
+            return `${this.getViewMatchExpressionBuilder()}(${argsList.join(', ')})`;
+
             //        let code = 'await (async () => {\n';
             //        if (this.expression && Array.isArray(this.cases)) {
             //            this.cases.forEach((item, index) => {
@@ -469,13 +528,29 @@ export class Match extends LogicItem {
     }
 
     toJS(state?: TranslatorState): string {
-        let code = 'await (async () => {\n';
+        //let code = 'await (async () => {\n';
+        //if (this.expression && Array.isArray(this.cases)) {
+        //    this.cases.forEach((item, index) => {
+        //        code += item?.toJS?.(this.expression, index, this.cases.length);
+        //    });
+        //}
+        //code += `})()`;
+        //return code;
+
+        let code = '';
+        // 祖先逻辑
+        const ancestorLogic = this.getAncestor('Logic');
+        if (ancestorLogic) {
+            code += 'await (async () => {\n';
+        } else {
+            code += '(() => {\n';
+        }
         if (this.expression && Array.isArray(this.cases)) {
             this.cases.forEach((item, index) => {
                 code += item?.toJS?.(this.expression, index, this.cases.length);
             });
         }
-        code += `})()`;
+        code += '})()';
         return code;
     }
 

package/src/concepts/NewComposite__.ts

@@ -3,6 +3,7 @@ import { ElementToVueOptions } from './ViewElement__';
 import MemberExpression from './MemberExpression__';
 import StructureProperty from './StructureProperty__';
 import App from './App__';
+import { genHash } from '../generator';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -1215,7 +1216,7 @@ export class NewComposite extends LogicItem {
                 }
             });
             code += 'return {\n';
-            code += `__name: "AStructure_${this.typeAnnotation.hash}" as const,\n`;
+            code += `__name: "AStructure_${genHash(JSON.stringify(this))}" as const,\n`;
             this.properties.forEach((property) => {
                 code += `${property.name},\n`;
             });
@@ -1266,7 +1267,7 @@ export class NewComposite extends LogicItem {
             }
         });
         code += '\nreturn {\n';
-        code += `__name: "AStructure_${this.typeAnnotation.hash}" as const,\n`;
+        code += `__name: "AStructure_${genHash(JSON.stringify(this))}" as const,\n`;
         this.properties.forEach((property) => {
             code += `${property.name},\n`;
         });
@@ -1279,9 +1280,23 @@ export class NewComposite extends LogicItem {
         return code;
     }
 
+    __addIdentifier() {
+        this.app.emit('collect:start', {
+            actionMsg: '添加匿名数据结构属性',
+        });
+        const node = this.addIdentifier({ name: this.getIdentifierUniqueName('property1') });
+        const struct = StructureProperty.from({
+            name: node.name,
+            typeAnnotation: null,
+        });
+        this.typeAnnotation.addStructureProperty(struct);
+        this.app.emit('collect:end');
+    }
+
     __deleteIdentifier(property: Identifier) {
         const index = this.properties.findIndex((p) => p === property);
         const newLines: AssignmentLine[] = [];
+        const newProperties = this.typeAnnotation.properties.filter((item) => item.name !== property.name);
         this.assignmentLines.forEach((line) => {
             const { leftIndex } = line;
             if (leftIndex[1] < index) {
@@ -1295,6 +1310,9 @@ export class NewComposite extends LogicItem {
             actionMsg: '删除匿名数据结属性',
         });
         this.setAssignmentLines(newLines);
+        this.typeAnnotation.update({
+            properties: newProperties,
+        });
         property.delete();
         this.app.emit('collect:end');
     }

package/src/concepts/ViewElement__.ts

@@ -1079,7 +1079,7 @@ export class ViewElement extends BaseNode {
     }
 
 
-    
+
 
     /**
     * 删除元素绑定属性
@@ -1348,6 +1348,10 @@ export class ViewElement extends BaseNode {
         return `${this.view.path}/${this.name}`;
     }
 
+    get auth() {
+        return this.bindDirectives.find((directive) => directive.name === 'auth');
+    }
+
     getViewElementUniqueName(name = 'viewElement1') {
         return this.view?.getViewElementUniqueName(name);
     }
@@ -2141,6 +2145,10 @@ export class ViewElement extends BaseNode {
                 }
             });
         }
+        // 部分组件增加 key 唯一标识，防止 vue 判断重复节点，导致渲染异常
+        if (this.name && ['u-table-view', 'u-list-view', 'u-grid-view', 'u-list-components', 'u-form', 'u-select'].includes(this.tag)) {
+            this.name && parts.push(`key="${this.name}"`);
+        }
 
         let partsLength = 0;
         let partsString = '';

package/src/concepts/View__.ts

@@ -2021,12 +2021,15 @@ export class View extends BaseNode {
         this.elements.forEach((item) => {
             utils.traverse((current) => {
                 const { node } = current as any;
-                // 处理三种情况
-                if (
-                    ['BindAttribute', 'BindDirective', 'BindStyle'].includes(node.concept)
-                    && node.needReplaceWithIdentifier
-                ) {
-                    bindExpressions.push(node);
+                //// 处理三种情况
+                //if (
+                //    ['BindAttribute', 'BindDirective', 'BindStyle'].includes(node.concept)
+                //    && node.needReplaceWithIdentifier
+                //) {
+                //    bindExpressions.push(node);
+                //}
+                if (node.concept === 'Match') {
+                    bindExpressions.push(node as Match);
                 }
             }, {
                 node: item,
@@ -2237,8 +2240,8 @@ export class View extends BaseNode {
         return code;
     }
 
-    getViewCallLogics():string[] {
-        const callbackLogics :string[] = [];
+    getViewCallLogics(): string[] {
+        const callbackLogics: string[] = [];
         this.traverseChildren((el) => {
             if (el instanceof Identifier && el.namespace?.endsWith('logics')) {
                 callbackLogics.push(el.namespace + '.' + el.name);

package/src/generator/genReleaseBody.ts

@@ -1,6 +1,6 @@
 import { App, Assignment, BatchAssignment, CallFunction, CallInterface, CallLogic, ForEachStatement, IfStatement, Logic, LogicItem, Match, MatchCase, MemberExpression, Role, SwitchCase, SwitchStatement, View, ViewElement, WhileStatement, StringInterpolation, Frontend, ExternalDestination, NewComposite, SelectMembers, NewList } from '../concepts';
 import { genFrontendBundleFiles } from './genBundleFiles';
-import { genPermissionData } from './permission';
+import { genPermissionData, genLogicAuthFlag } from './permission';
 import * as utils from '../utils';
 
 export async function genReleaseBody(app: App, {
@@ -47,6 +47,7 @@ export async function genReleaseBody(app: App, {
     const body = {
         ...authReport, // 如果发布需要上报权限，导出源码不需要
         logicPageResourceDtoList,
+        logicAuthFlag: genLogicAuthFlag(app),
         noAuthApiPathList: getAuthApiPathList(app, frontends),
         reportIdList: findAllReportIdList(app, frontends),
         appId: app.id,

package/src/generator/permission.ts

@@ -102,13 +102,11 @@ function findResourcesOfUI(view: View | ViewElement) {
                 path: node.authPath,
                 type: 'page',
             });
-        else if (node instanceof ViewElement) {
-            const hasAuth = node.bindDirectives.find((directive) => directive.name === 'auth');
-            if (hasAuth)
-                res.push({
-                    path: node.authPath,
-                    type: 'component',
-                });
+        else if (node instanceof ViewElement && node.auth) {
+            res.push({
+                path: node.authPath,
+                type: 'component',
+            });
         }
         node = node.parentNode;
     }
@@ -275,3 +273,15 @@ export async function genPermissionData(app: App) {
     // console.timeEnd('xxx');
     return logicPageResourceDtoList;
 }
+
+export function genLogicAuthFlag(app: App) {
+    let flag = false;
+    app.traverseChildren((node) => {
+        if(flag) return;
+
+        if((node instanceof View || node instanceof ViewElement) && node.auth)
+            flag = true;
+    });
+
+    return flag;
+}

package/src/index.ts

@@ -1,6 +1,6 @@
 export { EventEmitter, EventPayload, BaseNode } from './common';
 export * from './concepts';
-export { genBundleFiles, genFrontendBundleFiles, genMetaData, genReleaseBody, genPermissionData } from './generator';
+export { genBundleFiles, genFrontendBundleFiles, genMetaData, genReleaseBody, genPermissionData, genLogicAuthFlag } from './generator';
 export * from './translator';
 // export { default as diagnosticManager } from './manager/diagnostic';
 export { default as server, NaslServer } from './server';

package/src/server/naslServer.ts

@@ -1679,8 +1679,8 @@ export class NaslServer {
                 const diagnostic = {
                     node,
                     severity: 'error',
-                    message: '匹配分支：表达式不能为空',
-                    titleTip: '表达式不能为空',
+                    message: '匹配分支：返回内容不能为空',
+                    titleTip: '返回内容不能为空',
                 };
                 node.tsErrorDetail = diagnostic;
                 diagnostics.push(diagnostic);
@@ -1792,11 +1792,12 @@ export class NaslServer {
                         'nasl.collection.Map<nasl.core.String, nasl.core.String>',
                         'nasl.collection.Map<nasl.core.String, nasl.core.Text>',
                         'nasl.collection.Map<nasl.core.String, nasl.core.Email>',
-                        'nasl.collection.List<>',
                     ];
                     // 先特殊处理等 类型合并后就可以去掉了
                     if (excludeList.includes(leftType.sortedTypeKey) && excludeList.includes(rightType.sortedTypeKey)) {
                         return null;
+                    } else if (['nasl.collection.List<>'].includes(leftType.sortedTypeKey) || ['nasl.collection.List<>'].includes(rightType.sortedTypeKey)) {
+                        return null;
                     }
                     const diagnostic = {
                         node: node.right,
@@ -3056,7 +3057,11 @@ export class NaslServer {
                 }
             } else if (node.concept === 'Match') {
                 // 去查return 后面的返回值，变成函数调用
-                fileDetail.line = item.range.end.line - 1;
+                if (item.code?.endsWith(';\n')) {
+                    fileDetail.line = item.range.end.line - 1;
+                } else {
+                    fileDetail.line = item.range.end.line;
+                }
                 const indexOf = item.code.indexOf('return __MatchExpressionFuntion');
                 let newCode = item.code.substring(0, indexOf);
                 newCode = newCode.substring(newCode.lastIndexOf('\n'), indexOf);
@@ -3108,8 +3113,8 @@ export class NaslServer {
                 // 直接从最后一项的返回值取，有就有没有就没有
                 if (node.body?.length) {
                     const last = node.body[node.body.length - 1];
-                    if (last.__TypeAnnotation) {
-                        types.set(node, last.__TypeAnnotation);
+                    if (types.get(last)) {
+                        types.set(node, types.get(last));
                     }
                 }
             }

package/src/templator/genCurdEditMultipleKeyBlock.ts

@@ -31,7 +31,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
 
     return `
 <u-linear-layout justify="space-between">
-    <u-form layout="inline" label-size="auto">
+    <u-form layout="inline">
     ${properties
         .map((property) => {
             const vModel = `${nameGroup.viewVariableFilter}.${property.name}`;
@@ -97,7 +97,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
         })
         .join('')}
 
-        <u-form-item layout="center">
+        <u-form-item layout="center" label-size="auto">
             <u-button color="primary" @click="${nameGroup.viewLogicReload}">查询</u-button>
         </u-form-item>
     </u-form>

package/src/templator/genCurdMultipleKeyBlock.ts

@@ -22,7 +22,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
     const properties = entity.properties.filter(filterProperty('inFilter'));
     return `
 <u-linear-layout justify="space-between">
-    <u-form layout="inline" label-size="auto">
+    <u-form layout="inline">
     ${properties
         .map((property) => {
             const vModel = `${nameGroup.viewVariableFilter}.${property.name}`;
@@ -91,7 +91,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
         })
         .join('')}
 
-        <u-form-item layout="center">
+        <u-form-item layout="center" label-size="auto">
             <u-button color="primary" @click="${nameGroup.viewLogicReload}">查询</u-button>
         </u-form-item>
     </u-form>

package/src/translator/index.ts

@@ -89,7 +89,9 @@ export function withSourceMap() {
         descriptor.value = function (this: BaseNode, state?: TranslatorState, ...args: any[]) {
             // 重新生成ts代码就先把类型清除掉
             // 注意排查错误的时候，调用了这个方法，就会把节点上缓存的__TypeAnnotation清除
-            this.__isCorrectTypeAnnotation = false;
+            try {
+                this.__isCorrectTypeAnnotation = false;
+            } catch (err) {}
             if (!state) {
                 // 没有状态不生成 SourceMap
                 return oldMethod.call(this);