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

package/src/concepts/ViewElement__.ts

@@ -322,8 +322,9 @@ export class ViewElement extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
-
-
+    getClassName() {
+        return 'ViewElement';
+    }
 
     /**
      * 从父级删除该节点
@@ -373,7 +374,7 @@ export class ViewElement extends BaseNode {
         });
     }
 
-        getBindAttributeExistingNames(excludedList: Array<BindAttribute> = []) {
+    getBindAttributeExistingNames(excludedList: Array<BindAttribute> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.bindAttrs as BindAttribute[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -514,7 +515,6 @@ export class ViewElement extends BaseNode {
         return node;
     }
 
-
     getBindEventExistingNames(excludedList: Array<BindEvent> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.bindEvents as BindEvent[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -656,7 +656,6 @@ export class ViewElement extends BaseNode {
         return node;
     }
 
-
     getBindDirectiveExistingNames(excludedList: Array<BindDirective> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.bindDirectives as BindDirective[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -798,9 +797,6 @@ export class ViewElement extends BaseNode {
         return node;
     }
 
-
-
-
     getBindStyleExistingNames(excludedList: Array<BindStyle> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.bindStyles as BindStyle[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -942,11 +938,7 @@ export class ViewElement extends BaseNode {
         return node;
     }
 
-
-
-
     /**
-    * 插入页面元素
     * @internal
     * @param name 页面元素名称，如果不填会自动生成一个唯一名称
     */
@@ -1079,7 +1071,7 @@ export class ViewElement extends BaseNode {
     }
 
 
-
+    
 
     /**
     * 删除元素绑定属性
@@ -1129,8 +1121,6 @@ export class ViewElement extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除元素绑定事件
     * @param name 元素绑定事件名称
@@ -1179,8 +1169,6 @@ export class ViewElement extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除元素指令
     * @param name 元素指令名称
@@ -1229,8 +1217,6 @@ export class ViewElement extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除元素绑定样式
     * @param name 元素绑定样式名称
@@ -1279,8 +1265,6 @@ export class ViewElement extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除页面元素
     * @param name 页面元素名称
@@ -1341,6 +1325,11 @@ export class ViewElement extends BaseNode {
         return this.view.parentNode.concept === 'App' ? this.view.auth : this.frontend.views.find((item) => item.name === mainViewName)?.auth;
     }
 
+    // IDE内展示需要屏蔽掉“系统统一路径前缀”
+    get uiPath() {
+        return `${this.view.uiPath}/${this.name}`;
+    }
+
     /**
      * 权限领域的资源路径
      */
@@ -1423,7 +1412,7 @@ export class ViewElement extends BaseNode {
                 if (tag === 'u-input') {
                     code += '<nasl.core.String>';
                 } else if (tag === 'u-input-number') {
-                    code += '<nasl.core.Integer>';
+                    code += '<nasl.core.Long>';
                 } else {
                     code += '<any>';
                 }
@@ -1632,7 +1621,7 @@ export class ViewElement extends BaseNode {
         const oldName = element.name;
         element.deepRenameElements(this);
         if (element.tag === 'u-modal' || element.tag === 'u-drawer') {
-            const cancelNode = traverse(({ node }: { node: any}) => {
+            const cancelNode = traverse(({ node }: { node: any }) => {
                 if (node?.bindAttrs?.find((bindAttr: any) => bindAttr.value === '取消'))
                     return node;
             }, { node: element });
@@ -1793,7 +1782,7 @@ export class ViewElement extends BaseNode {
                         }
                         attr = new BindAttribute(source);
                     } catch (e) {
-                        const expression = <any> this._parseExpression(oldAttr.value);
+                        const expression = <any>this._parseExpression(oldAttr.value);
                         attr = new BindAttribute({
                             type: 'dynamic',
                             name: oldAttr.name,
@@ -1850,7 +1839,7 @@ export class ViewElement extends BaseNode {
                     if (directive.name === 'model') {
                         const valueAttr = astNode.attrs && astNode.attrs.find((attr) => attr.name === 'value');
                         if (!valueAttr) {
-                            const expression = <any> this._parseExpression(directive.value);
+                            const expression = <any>this._parseExpression(directive.value);
                             element.addBindAttribute(new BindAttribute({
                                 type: 'dynamic',
                                 name: 'value',
@@ -1860,7 +1849,7 @@ export class ViewElement extends BaseNode {
                             }));
                         }
                     } else {
-                        const expression = <any> this._parseExpression(directive.value);
+                        const expression = <any>this._parseExpression(directive.value);
                         element.addBindDirective(new BindDirective({
                             type: expression ? 'string' : 'dynamic',
                             name: directive.name,
@@ -1879,7 +1868,7 @@ export class ViewElement extends BaseNode {
                     name: 'if',
                     rawName: 'v-if',
                     value: '',
-                    expression: <any> this._parseExpression(astNode.if),
+                    expression: <any>this._parseExpression(astNode.if),
                 }));
             }
         } else if (astNode.type === 2) {
@@ -1890,7 +1879,7 @@ export class ViewElement extends BaseNode {
                 name: view.getViewElementUniqueName(`${baseName}1`),
             });
             const value = astNode.text?.match(/{{(.*?)}}/)[1].trim();
-            const expression = <any> this._parseExpression(value);
+            const expression = <any>this._parseExpression(value);
             element.addBindAttribute(new BindAttribute({
                 type: 'dynamic',
                 name: 'text',

package/src/concepts/View__.ts

@@ -177,6 +177,9 @@ export class View extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'View';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): View {
         return super.from(source, parentNode, parentKey) as View;
@@ -1938,7 +1941,8 @@ export class View extends BaseNode {
         };
     }
 
-    get path() {
+    // IDE内展示需要屏蔽掉“系统统一路径前缀”
+    get uiPath() {
         const basePath = this.frontend.basePath;
         const _path = [];
         let view: View = this;
@@ -1953,6 +1957,21 @@ export class View extends BaseNode {
         return `${basePath}${path}`;
     }
 
+    get path() {
+        const prefixPath = this.frontend.prefixPath;
+        const _path = [];
+        let view: View = this;
+        while (view.concept === 'View') {
+            _path.push(view.name);
+            view = view.parentNode as View;
+        }
+        let path = '/';
+        if (_path.length) {
+            path += `${_path.reverse().join('/')}`;
+        }
+        return `${prefixPath}${path}`;
+    }
+
     /**
      * 权限领域的资源路径
      */

package/src/concepts/WhileStatement__.ts

@@ -45,6 +45,9 @@ export class WhileStatement extends LogicItem {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'WhileStatement';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): WhileStatement {
         return super.from(source, parentNode, parentKey) as WhileStatement;