@lcap/nasl 0.3.10-beta.oom4 → 0.3.12-beta

package/src/types/logic/translator.js

@@ -1,4 +1,4 @@
-import { Vertex } from '..';
+import { Vertex, utils } from '..';
 
 function switchCase2If(cases) {
     const cas = cases.shift();
@@ -8,7 +8,13 @@ function switchCase2If(cases) {
         test: cas.test,
         consequent: {
             type: 'BlockStatement',
-            body: cas.consequent || [],
+            body: [
+                {
+                    type: 'CallConsoleInfo',
+                    content: 'SWITCHCASE',
+                },
+                ...cas.consequent || [],
+            ],
         },
         alternate: null,
     };
@@ -18,7 +24,13 @@ function switchCase2If(cases) {
     } else {
         return {
             type: 'BlockStatement',
-            body: cas.consequent || [],
+            body: [
+                {
+                    type: 'CallConsoleInfo',
+                    content: 'SWITCHDEFAULT',
+                },
+                ...cas.consequent || [],
+            ],
         };
     }
 
@@ -26,6 +38,7 @@ function switchCase2If(cases) {
 }
 
 export default function (source) {
+    const isGONGHANG = utils.getGlobalEnv() === 'gonghang';
     const definition = typeof source === 'string' ? JSON.parse(source) : source;
 
     function traverse(node, func, parent, index) {
@@ -458,6 +471,13 @@ export default function (source) {
                 return `${newLine()}console.log(${generateNode(node.arguments[0])})${colon()}${newLine()}`;
             }
 
+            if (node.type === 'CallConsoleInfo') {
+                if (isGONGHANG) {
+                    return `console.info("${node.content}")${colon()}`;
+                }
+                return '';
+            }
+
             if (node.type === 'Destination') {
                 const params = (node.params || [])
                     .filter((param) => param.pageParamKey && param.pageParamKeyValue)
@@ -478,16 +498,27 @@ export default function (source) {
                 if (Array.isArray(node.consequent)) {
                     node.consequent = {
                         type: 'BlockStatement',
-                        body: node.consequent,
+                        body: [
+                            {
+                                type: 'CallConsoleInfo',
+                                content: 'IF',
+                            },
+                            ...node.consequent,
+                        ],
                     };
                 }
-                if (Array.isArray(node.alternate)) {
+                if (Array.isArray(node.alternate) && node.alternate.length > 0) {
                     node.alternate = {
                         type: 'BlockStatement',
-                        body: node.alternate,
+                        body: [
+                            {
+                                type: 'CallConsoleInfo',
+                                content: 'ELSE',
+                            },
+                            ...node.alternate,
+                        ],
                     };
                 }
-
                 let alternateScript = '';
                 if (node.alternate) {
                     alternateScript = generateNode(node.alternate);
@@ -597,9 +628,9 @@ export default function (source) {
         });
 
         return `methods['${logic.name}'] = async function (${logic.params.map((param) => param.name).join(', ')}) {
-            ${logic.params.length ? logic.params.map((param) => `${param.name} = ${param.name} !== undefined ? ${param.name} : this.$genInitFromSchema(${JSON.stringify(param.schema)}, ${JSON.stringify(param.defaultValue)});`).join('\n') + '' : ''}
-            ${logic.variables.length ? logic.variables.map((variable) => `let ${variable.name} = this.$genInitFromSchema(${JSON.stringify(variable.schema)}, ${JSON.stringify(variable.defaultValue)});`).join('\n') + '' : ''}
-            let ${returnObj.name} = this.$genInitFromSchema(${JSON.stringify(returnObj.schema)}, ${JSON.stringify(returnObj.defaultValue)});
+            ${logic.params.length ? logic.params.map((param) => `${param.name} = ${param.name} !== undefined ? ${param.name} : this.$genInitFromSchema(${JSON.stringify(param.schema)}, ${JSON.stringify(param.defaultValue)});` + (isGONGHANG ? `console.info(${param.name})` : '')).join('\n') + '' : ''}
+            ${logic.variables.length ? logic.variables.map((variable) => `let ${variable.name} = this.$genInitFromSchema(${JSON.stringify(variable.schema)}, ${JSON.stringify(variable.defaultValue)});` + (isGONGHANG ? `console.info(${variable.name})` : '')).join('\n') + '' : ''}
+            let ${returnObj.name} = this.$genInitFromSchema(${JSON.stringify(returnObj.schema)}, ${JSON.stringify(returnObj.defaultValue)});` + (isGONGHANG ? `console.info(${returnObj.name})` : '') + `
             ${script}
         }`;
     });

package/src/types/page/Element.ts

@@ -30,14 +30,14 @@ export interface ParseContext {
 
 export function catchFn(view: View) {
     return async (err: any) => {
-        if(err.code !== BusinessCode.HasReferenced)  // 节点被引用，不用刷新数据
+        if (err.code !== BusinessCode.HasReferenced) // 节点被引用，不用刷新数据
             await refreshHtml(view);
         else
             config.defaultApp?.emit('saved', err);
 
         config.defaultApp?.history.load();
         throw err;
-    }
+    };
 }
 
 /**
@@ -75,6 +75,12 @@ export class Element extends Vertex {
      */
     @immutable()
     public readonly name: string = undefined;
+
+    /*
+    * 描述信息
+    */
+    @immutable()
+    public readonly description: string = undefined;
     /**
      * 属性列表
      * 和原来的 attrsList 不同，注意区分
@@ -154,6 +160,16 @@ export class Element extends Vertex {
      */
     @immutable()
     public readonly children?: Array<Element> = [];
+    /**
+     * 标签名前缀
+     */
+    @immutable()
+    public static readonly TAG_NAME_PREFIX_REG?: RegExp = /^([lieu]|van)[-_]/;
+    /**
+     * 忽略命名的标签
+     */
+    @immutable()
+    public static readonly ignoreTag?: Array<string> = ['div', 'span'];
 
     /**
      * @param source 需要合并的部分参数
@@ -180,45 +196,45 @@ export class Element extends Vertex {
         }
 
         config.defaultApp?.emit('saving');
-            if (actionOptions?.actionMode !== ACTION_MODE.undoRedo) {
-                const body = this.toJSON();
-                body.parentId = this.parent && this.parent.id;
-                body._posIndex = this.parent && this.parent.children.indexOf(this);
-                utils.logger.debug('添加元素', body);
-                const result = await elementService.create({
-                    headers: {
-                        appId: config.defaultApp?.id,
-                        operationAction: 'Element.create',
-                        operationDesc: `添加组件"${this.getElementTitle()}"`,
-                    },
-                    body,
-                }).catch(catchFn(this.view));
-
-                this.deepPick(result, ['id', 'parentId', 'elementId']);
-                // attr,directive,event的id,exprssion需要合并
-                this.attrList.forEach((attr, index) => {
-                    attr.deepPick(result.attrList[index], ['id', 'expression']);
-                });
-                this.directiveList.forEach((directive, index) => {
-                    directive.deepPick(result.directiveList[index], ['id', 'expression']);
-                });
-                this.eventList.forEach((event, index) => {
-                    event.deepPick(result.eventList[index], ['id']);
-                });
-            }
-
-            this.view && this.view.emit('change');
-
-            if (actionOptions?.loadHistory !== false) {
-                await config.defaultApp?.history.load(actionOptions?.actionMode !== ACTION_MODE.undoRedo && {
+        if (actionOptions?.actionMode !== ACTION_MODE.undoRedo) {
+            const body = this.toJSON();
+            body.parentId = this.parent && this.parent.id;
+            body._posIndex = this.parent && this.parent.children.indexOf(this);
+            utils.logger.debug('添加元素', body);
+            const result = await elementService.create({
+                headers: {
+                    appId: config.defaultApp?.id,
                     operationAction: 'Element.create',
-                    operationBeforeImage: null,
-                    operationAfterImage: JSON.parse(JSON.stringify(this)),
                     operationDesc: `添加组件"${this.getElementTitle()}"`,
-                });
+                },
+                body,
+            }).catch(catchFn(this.view));
+
+            this.deepPick(result, ['id', 'parentId', 'elementId']);
+            // attr,directive,event的id,expression需要合并
+            this.attrList.forEach((attr, index) => {
+                attr.deepPick(result.attrList[index], ['id', 'expression']);
+            });
+            this.directiveList.forEach((directive, index) => {
+                directive.deepPick(result.directiveList[index], ['id', 'expression']);
+            });
+            this.eventList.forEach((event, index) => {
+                event.deepPick(result.eventList[index], ['id']);
+            });
+        }
+
+        this.view && this.view.emit('change');
+
+        if (actionOptions?.loadHistory !== false) {
+            await config.defaultApp?.history.load(actionOptions?.actionMode !== ACTION_MODE.undoRedo && {
+                operationAction: 'Element.create',
+                operationBeforeImage: null,
+                operationAfterImage: JSON.parse(JSON.stringify(this)),
+                operationDesc: `添加组件"${this.getElementTitle()}"`,
+            });
             config.defaultApp?.emit('saved');
-            }
-            return this;
+        }
+        return this;
     }
     /**
      * 删除元素
@@ -228,6 +244,7 @@ export class Element extends Vertex {
         if (actionOptions?.actionMode === ACTION_MODE.local) {
             const index = this.parent.children.indexOf(this);
             ~index && this.parent.children.splice(index, 1);
+            this.deepRemoveElementsName();
             this.view && this.view.emit('local-change');
             return this;
         }
@@ -239,21 +256,24 @@ export class Element extends Vertex {
 
         if (actionOptions?.actionMode !== ACTION_MODE.undoRedo) {
             if (this.id) {
-                    await elementService.delete({
-                        headers: {
-                            appId: config.defaultApp?.id,
-                            operationAction: 'Element.delete',
-                            operationDesc: `删除组件"${this.getElementTitle()}"`,
-                        },
-                        query: {
-                            id: this.id,
-                        },
-                    }).catch(catchFn(this.view));
+                await elementService.delete({
+                    headers: {
+                        appId: config.defaultApp?.id,
+                        operationAction: 'Element.delete',
+                        operationDesc: `删除组件"${this.getElementTitle()}"`,
+                    },
+                    query: {
+                        id: this.id,
+                    },
+                }).catch(catchFn(this.view));
             }
         }
 
         const index = this.parent.children.indexOf(this);
         ~index && this.parent.children.splice(index, 1);
+
+        // 递归删除组件名的缓存
+        this.deepRemoveElementsName();
         this.destroy();
         this.view && this.view.emit('change');
         if (actionOptions?.loadHistory !== false) {
@@ -273,32 +293,32 @@ export class Element extends Vertex {
             config.defaultApp?.emit('saving');
 
             source && this.assign(source);
-                if (actionOptions?.actionMode !== ACTION_MODE.undoRedo) {
-                    const body = this.toPlainJSON();
-                    utils.logger.debug('修改组件', body);
-                    await elementService.update({
-                        headers: {
-                            appId: config.defaultApp?.id,
-                            operationAction: actionOptions?.actionName || 'Element.update',
-                            operationDesc: actionOptions?.actionDesc || `修改组件"${this.getElementTitle()}"`,
-                        },
-                        body,
-                    }).catch(catchFn(this.view));
-                }
+            if (actionOptions?.actionMode !== ACTION_MODE.undoRedo) {
+                const body = this.toPlainJSON();
+                utils.logger.debug('修改组件', body);
+                await elementService.update({
+                    headers: {
+                        appId: config.defaultApp?.id,
+                        operationAction: actionOptions?.actionName || 'Element.update',
+                        operationDesc: actionOptions?.actionDesc || `修改组件"${this.getElementTitle()}"`,
+                    },
+                    body,
+                }).catch(catchFn(this.view));
+            }
 
-                this.view && this.view.emit('change');
-                await config.defaultApp?.history.load(actionOptions?.actionMode !== ACTION_MODE.undoRedo && {
-                    operationAction: 'Element.update',
-                    operationBeforeImage: null,
-                    operationAfterImage: null,
-                    operationDesc: `修改组件"${this.getElementTitle()}"`,
-                });
+            this.view && this.view.emit('change');
+            await config.defaultApp?.history.load(actionOptions?.actionMode !== ACTION_MODE.undoRedo && {
+                operationAction: 'Element.update',
+                operationBeforeImage: null,
+                operationAfterImage: null,
+                operationDesc: `修改组件"${this.getElementTitle()}"`,
+            });
 
                 config.defaultApp?.emit('saved');
                 return this;
     }
 
-        /**
+    /**
      * 按当前 id 加载逻辑数据
      */
     async load() {
@@ -378,6 +398,8 @@ export class Element extends Vertex {
 
         const index = this.parent.children.indexOf(this);
         const newNode = Element.fromHTML(code, this.parent, this.view);
+        // 复制的元素需重新命名
+        newNode.deepRenameElements();
 
         const mergeExpression = (originList: Array<Attr|Directive>, newList: Array<Attr|Directive>) => {
             newList.forEach((item) => {
@@ -495,7 +517,7 @@ export class Element extends Vertex {
         await this.update(undefined, {
             actionDesc: `设置组件"${this.getElementTitle()}"的名称为"${name}"`,
         });
-        
+
         if (!(window as any).globalData.hasUserCenter) {
             // 同步权限
             new Nuims({
@@ -509,6 +531,22 @@ export class Element extends Vertex {
             this.view.page.service.emit('vertexIdToNameChange', this.id, this.name);
         }
     }
+
+    /**
+     * 更新描述信息
+     * @param description
+     */
+    async setDescription(description: string) {
+        this.assign({ description });
+        await this.update(undefined, {
+            actionDesc: `设置组件"${this.getElementTitle()}"的描述为"${description}"`,
+        });
+
+        this.view && this.view.emit('change');
+        if (this.view && this.view.page && this.view.page.service) {
+            this.view.page.service.emit('vertexIdToNameChange', this.id, this.name);
+        }
+    }
     /**
      * 添加组件属性
      */
@@ -729,8 +767,11 @@ export class Element extends Vertex {
                 if (attr.level === LEVEL_ENUM.attr) {
                     const api = config.allNodesAPI[el.tag];
                     const apiOfAttr = api && api.attrs && api.attrs.find((_attr) => _attr.name === attr.name);
-                    if (apiOfAttr && apiOfAttr['designer-value']) {
-                        const designerValue = apiOfAttr['designer-value'].replace(/"/g, '\'');
+                    if (apiOfAttr && apiOfAttr['designer-value'] !== undefined) {
+                        let designerValue = apiOfAttr['designer-value'];
+                        if (typeof designerValue === 'string') {
+                            designerValue = designerValue.replace(/"/g, '\'');
+                        }
                         try {
                             json5.parse(designerValue);
                             return `:${attr.name}="${designerValue}"`;
@@ -843,6 +884,46 @@ export class Element extends Vertex {
             }
         }
     }
+
+    // 初始化组件名
+    public initElementName() {
+        if (Element.ignoreTag.includes(this.tag)) {
+            return;
+        }
+        const name = this.genElementName();
+        this.assign({ name });
+        this.view.addElementName(name);
+    }
+
+    // 生成新的组件名
+    public genElementName(): string {
+        const compNameSet = this.view.elementNameSet;
+        const tagName = this.tag.replace(Element.TAG_NAME_PREFIX_REG, '').replace(/-/g, '_');
+        const componentName = utils.unique(tagName + '1', compNameSet);
+        return componentName;
+    }
+
+    // 递归生成组件名
+    public deepRenameElements(): void {
+        return this.traverseChildren((ele: Element) => {
+            ele.initElementName();
+        });
+    }
+
+    // 递归删除组件名的缓存
+    public deepRemoveElementsName(): void {
+        return this.traverseChildren((ele: Element) => {
+            this.view.removeElementName(ele.name);
+        });
+    }
+
+    // 递归遍历组件
+    public traverseChildren(cb: (ele: Element) => void): void {
+        utils.traverse((current) => {
+            cb(current.node);
+        }, { node: this });
+    }
+
     /**
      * 从 Vue 的 ASTNode 转换成 ASL 元素
      * @param astNode Vue 的 ASTNode
@@ -1321,6 +1402,11 @@ export class Element extends Vertex {
         const element = this.parse(html, context);
         utils.traverse((current) => {
             current.node.assign({ view, parent: current.parent });
+            // 生成唯一组件名 依赖element.view
+
+            if (!current.node.name) {
+                current.node.initElementName();
+            }
         }, { node: element, parent });
         return element;
     }

package/src/types/page/Page.ts

@@ -56,6 +56,13 @@ export class Page extends Vertex {
      */
     @immutable()
     public readonly isIndex: boolean = undefined;
+
+    /**
+     * 描述信息
+     */
+    @immutable()
+    public readonly description: string = undefined;
+
     /**
      * 根页面视图
      */