@lcap/nasl 2.20.0-beta.3 → 2.20.0-beta.5

package/src/concepts/ViewElement__.ts

@@ -6,6 +6,7 @@ import * as json5 from 'json5';
 import * as compiler from 'vue-template-compiler';
 
 import LogicItem from './LogicItem__';
+import { traverse } from '../utils';
 
 import { config, Logic } from '..';
 import MemberExpression from './MemberExpression__';
@@ -322,6 +323,8 @@ export class ViewElement extends BaseNode {
         super.subConstructor(source);
     }
 
+
+
     /**
      * 从父级删除该节点
      * @internal
@@ -370,7 +373,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);
     }
@@ -511,6 +514,7 @@ 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);
@@ -652,6 +656,7 @@ 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);
@@ -793,6 +798,9 @@ 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);
@@ -934,6 +942,9 @@ export class ViewElement extends BaseNode {
         return node;
     }
 
+
+
+
     /**
     * 插入页面元素
     * @internal
@@ -1067,6 +1078,9 @@ export class ViewElement extends BaseNode {
         return node;
     }
 
+
+
+
     /**
     * 删除元素绑定属性
     * @param name 元素绑定属性名称
@@ -1115,6 +1129,8 @@ export class ViewElement extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除元素绑定事件
     * @param name 元素绑定事件名称
@@ -1163,6 +1179,8 @@ export class ViewElement extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除元素指令
     * @param name 元素指令名称
@@ -1211,6 +1229,8 @@ export class ViewElement extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除元素绑定样式
     * @param name 元素绑定样式名称
@@ -1259,6 +1279,8 @@ export class ViewElement extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除页面元素
     * @param name 页面元素名称
@@ -1326,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);
     }
@@ -1487,7 +1513,7 @@ export class ViewElement extends BaseNode {
             this.children.forEach((element) => {
                 code += element.toEmbeddedTS(shiftState(state, code, {
                     tabSize: (state?.tabSize || 0),
-                }));
+                }), levelIndex);
             });
             code += indent((state?.tabSize || 0) + 2);
             code += ']';
@@ -1603,7 +1629,22 @@ export class ViewElement extends BaseNode {
 
     _duplicate() {
         const element = ViewElement.from(this.toTemplateJSON());
+        const oldName = element.name;
         element.deepRenameElements(this);
+        if (element.tag === 'u-modal' || element.tag === 'u-drawer') {
+            const cancelNode = traverse(({ node }: { node: any}) => {
+                if (node?.bindAttrs?.find((bindAttr: any) => bindAttr.value === '取消'))
+                    return node;
+            }, { node: element });
+            cancelNode.bindEvents.forEach(({ logics }: { logics: any }) => {
+                logics.forEach(({ body }: { body: any }) => {
+                    body.forEach((item: any) => {
+                        if (item.concept === 'CallLogic' && item.calleeName === 'close' && item.calleeNamespace.split('.')[1] === oldName)
+                            item.calleeNamespace = `elements.${element.name}.logics`;
+                    });
+                });
+            });
+        }
         this.view.existingViewElement.clear();
         return element;
     }
@@ -2104,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

@@ -1094,7 +1094,6 @@ export class View extends BaseNode {
 
     /**
     * 删除页面元素
-    * @param name 页面元素名称
     */
     removeViewElement(name: string): void;
 
@@ -1388,7 +1387,9 @@ export class View extends BaseNode {
     /* 主页面有没有权限 */
     get parentAuth() {
         const _nameSpace = this.getTsNamespace();
-        const mainViewName = _nameSpace.split('.')[2];
+        const _nameSpaceArr = _nameSpace.split('.');
+        const viewsIndex = _nameSpaceArr.findIndex((item) => item === 'views');
+        const mainViewName = _nameSpaceArr[viewsIndex + 1];
         return mainViewName ? this.frontend.views.find((item) => item.name === mainViewName)?.auth : this.auth;
     }
     /**
@@ -1510,7 +1511,8 @@ export class View extends BaseNode {
                 const param = Param.from({
                     ...paramsOption,
                 }, this, 'params');
-                this.addParam(param);
+                this._addParam(param);
+                param.addParamsPrepare();
             });
         }
         // 页面变量
@@ -1626,7 +1628,7 @@ export class View extends BaseNode {
             first: this.children.find((child) => child.isIndex)?.name,
             auth: this.auth ? 'loginAuth' : undefined,
             viewBindEvents: this.getViewBindEvents(),
-            viewMatchExpressions: this.getViewMatchExpressions(),
+            viewExpressions: this.getViewExpressions(),
         };
         let code = '';
         let mixin = '';
@@ -1763,11 +1765,22 @@ export class View extends BaseNode {
                 // 子页面内部逻辑过滤
                 if (el.view !== this)
                     return;
-                const jsCode = el.toJS();
-                const advanceVar = this.variables?.find((variable) =>
-                    !variable.typeAnnotation && jsCode.includes(`this.${variable.name} = `));
-                if (advanceVar && !advanceMap.get(advanceVar)) {
-                    advanceMap.set(advanceVar, el);
+                if (el instanceof Assignment) {
+                    const advanceVar = this.variables?.find((variable) =>
+                        !variable.typeAnnotation && el.left?.name === variable.name);
+                    if (advanceVar && !advanceMap.get(advanceVar)) {
+                        advanceMap.set(advanceVar, el);
+                    }
+                } else if (el instanceof BatchAssignment) {
+                    el.assignmentLines.forEach(({ leftIndex }) => {
+                        const leftCode
+                            = leftIndex.length === 1 ? el.left?.expression?.toEmbeddedTS(shiftState(state, code, { inline: true })) : el.left?.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true }));
+                        const advanceVar = this.variables?.find((variable) =>
+                            !variable.typeAnnotation && leftCode === variable.name);
+                        if (advanceVar && !advanceMap.get(advanceVar)) {
+                            advanceMap.set(advanceVar, el);
+                        }
+                    });
                 }
             }
         });
@@ -1979,14 +1992,21 @@ export class View extends BaseNode {
         return bindEvents;
     }
 
-    // 获取页面上的match表达式，忽略页面逻辑
-    getViewMatchExpressions() {
-        const bindMatchExpressions: Array<Match> = [];
+    // 获取页面上需要替换的表达式
+    getViewExpressions() {
+        const bindExpressions: any[] = [];
         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 (node.concept === 'Match') {
-                    bindMatchExpressions.push(node as Match);
+                    bindExpressions.push(node as Match);
                 }
             }, {
                 node: item,
@@ -2007,7 +2027,7 @@ export class View extends BaseNode {
                 ]),
             });
         });
-        return bindMatchExpressions;
+        return bindExpressions;
     }
 
     /**
@@ -2087,6 +2107,7 @@ export class View extends BaseNode {
     }
 
     getRightCode(code: string, assignment: Assignment | BatchAssignment, rightNode: any): string {
+        code = code.replaceAll('\n', ' ');
         const logic = assignment.logic;
         const logicRtn = logic?.returns[0];
         // 调用接口，参数替换成 null
@@ -2164,8 +2185,8 @@ export class View extends BaseNode {
         const viewElements: ViewElement[] = [];
         while (element) {
             if (element.concept
-            && element.concept === 'ViewElement'
-            && (element as ViewElement).bindAttrs.find((bAttr) => bAttr.name === 'data-source')) {
+                && element.concept === 'ViewElement'
+                && (element as ViewElement).bindAttrs.find((bAttr) => bAttr.name === 'data-source')) {
                 viewElements.push(element as ViewElement);
             }
             element = element.parentNode;
@@ -2196,8 +2217,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);