@lcap/nasl 0.3.10 → 0.3.11

package/src/types/page/Page.ts

@@ -3,6 +3,23 @@ import { config, history, LEVEL_ENUM, Vertex, Entity, Enum, PackageJSON, App, We
 import pageService from '../../service/page';
 import { traverse } from '../utils';
 import { postServiceType } from '../../service/common/preprocess';
+import { refreshPages } from '../cache';
+import { BusinessCode } from '../enum';
+
+export function catchFn() {
+    return async (err: any) => {
+        const code = err?.code;
+        // 节点已存在； 节点不存在; 父节点不存在
+        if ([BusinessCode.ElementExist, BusinessCode.ElementNotExist, BusinessCode.ParentElementNotExist].includes(code)) {
+            await refreshPages();
+        } else
+            config.defaultApp?.emit('saved', err);
+
+        config.defaultApp?.history.load();
+
+        throw err;
+    };
+}
 
 /**
  * 页面（入口页）类，后端路由控制
@@ -39,6 +56,13 @@ export class Page extends Vertex {
      */
     @immutable()
     public readonly isIndex: boolean = undefined;
+
+    /**
+     * 描述信息
+     */
+    @immutable()
+    public readonly description: string = undefined;
+
     /**
      * 根页面视图
      */
@@ -95,13 +119,12 @@ export class Page extends Vertex {
         }, { node: this.rootView });
         const rootView = new View(this.rootView);
         rootView.assign({ page: this });
-        
+
         this.assign({ rootView });
     }
 
     addData(res: any) {
         const microService = this.service.app.firstMicroService;
-        
 
         const enums = res.enums as Array<Enum>;
         if (enums && enums.length) {
@@ -153,8 +176,8 @@ export class Page extends Vertex {
                 operationDesc: actionOptions?.actionDesc || `添加页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
             },
             body,
-        });
-      
+        }).catch(catchFn());
+
         this.deepPick(result.page, ['id']);
         // 添加数据和接口
         this.addData(result);
@@ -170,8 +193,8 @@ export class Page extends Vertex {
             tempPath: `/${rootView.name}`,
             code: `/ID_${rootView.id}`,
         });
-       this.rootView.attachNodePath();
-        if(result.page.isIndex) {
+        this.rootView.attachNodePath();
+        if (result.page.isIndex) {
             const tasks = this.service.pages.filter((page) => page.isIndex && page.id !== result.page.id)
                 .map((page) => {
                     page.assign({ isIndex: false });
@@ -179,7 +202,7 @@ export class Page extends Vertex {
                 });
             Promise.all(tasks);
         }
-    
+
         await then?.();
         this.service.emit('pageTreeChange');
 
@@ -187,10 +210,10 @@ export class Page extends Vertex {
         microService.emit('dataTypesChange');
         microService.emit('enumsChange');
         microService.emit('vertexIdToNameChange');
-        
+
         this.rootView.emit('change');
         // this.assign(Page.from(this, this.service));
-        
+
         await config.defaultApp?.history.load();
         config.defaultApp?.emit('saved');
         return this;
@@ -215,7 +238,7 @@ export class Page extends Vertex {
         });
         this.deepPick(result, ['id']);
         this.rootView.attachNodePath();
-        if(result.isIndex) {
+        if (result.isIndex) {
             const tasks = this.service.pages.filter((page) => page.isIndex && page.id !== result.id)
                 .map((page) => {
                     page.assign({ isIndex: false });
@@ -223,12 +246,12 @@ export class Page extends Vertex {
                 });
             Promise.all(tasks);
         }
-        
+
         await then?.();
         this.service.emit('pageTreeChange');
         this.rootView.emit('change');
         // this.assign(Page.from(this, this.service));
-        
+
         await config.defaultApp?.history.load();
         config.defaultApp?.emit('saved');
         return this;
@@ -240,21 +263,16 @@ export class Page extends Vertex {
     async delete(none?: void, actionOptions?: ActionOptions) {
         config.defaultApp?.emit('saving');
 
-        try {
-            await pageService.removePage({
-                headers: {
-                    appId: config.defaultApp?.id,
-                    operationAction: actionOptions?.actionName || 'Page.delete',
-                    operationDesc: actionOptions?.actionDesc || `删除页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
-                },
-                path: {
-                    id: this.id,
-                },
-            });
-        } catch(err) {
-            await config.defaultApp?.history.load();
-            throw err;
-        }
+        await pageService.removePage({
+            headers: {
+                appId: config.defaultApp?.id,
+                operationAction: actionOptions?.actionName || 'Page.delete',
+                operationDesc: actionOptions?.actionDesc || `删除页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
+            },
+            path: {
+                id: this.id,
+            },
+        }).catch(catchFn());
 
         const index = this.service.pages.indexOf(this);
         ~index && this.service.pages.splice(index, 1);
@@ -279,7 +297,7 @@ export class Page extends Vertex {
                 operationDesc: actionOptions?.actionDesc || `修改页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
             },
             body,
-        });
+        }).catch(catchFn());
 
         await config.defaultApp?.history.load();
         config.defaultApp?.emit('saved');
@@ -292,19 +310,41 @@ export class Page extends Vertex {
     async setAsIndex() {
         config.defaultApp?.emit('saving');
 
-        const tasks = this.service.pages.filter((page) => page.isIndex)
-            .map((page) => {
-                page.assign({ isIndex: false });
-                return page.update();
+        const oldIndexPages: Array<Page> = this.service.pages.filter((page) => page.isIndex);
+        const rejectedPages: Array<Page> = [];
+        const tasks = oldIndexPages.map((page) => {
+            page.assign({ isIndex: false });
+            return page.update().catch((e) => {
+                rejectedPages.push(page);
+                return Promise.reject(e);
+            });
+        });
+
+        // 去掉旧首页
+        try {
+            await Promise.all(tasks);
+        } catch (e) {
+            // 恢复状态
+            rejectedPages.forEach((page) => page.assign({ isIndex: true }));
+
+            this.service.emit('pageTreeChange');
+            await config.defaultApp?.history.load();
+            config.defaultApp?.emit('saved');
+            return;
+        }
+
+        // 设置新首页
+        try {
+            this.assign({ isIndex: true });
+            await this.update(undefined, {
+                actionDesc: `设置页面"${this.name}"为首页`,
             });
-        this.assign({ isIndex: true });
-        tasks.push(this.update(undefined, {
-            actionDesc: `设置页面"${this.name}"为首页`,
-        }));
-        await Promise.all(tasks);
+        } catch (e) {
+            // 恢复状态
+            this.assign({ isIndex: false });
+        }
 
         this.service.emit('pageTreeChange');
-
         await config.defaultApp?.history.load();
         config.defaultApp?.emit('saved');
     }
@@ -356,8 +396,8 @@ export class Page extends Vertex {
         page.assign({
             rootView: View.from(page.rootView, null, page),
             service,
-            tempPath: page.rootView? `/${page.rootView.name}`: '',
-            code: page.rootView?`/ID_${page.rootView.id}`: '',
+            tempPath: page.rootView ? `/${page.rootView.name}` : '',
+            code: page.rootView ? `/ID_${page.rootView.id}` : '',
         });
 
         return page;

package/src/types/page/View.ts

@@ -16,6 +16,7 @@ import * as babel from '@babel/core';
 import view from '@/service/page/view';
 import Entity from '../data/Entity';
 import { postServiceType } from '../../service/common/preprocess';
+import { catchFn } from './Page';
 
 /**
  * 子页面类，前端路由控制
@@ -58,6 +59,12 @@ export class View extends Block {
      */
     @immutable()
     public readonly title: string = undefined;
+
+    /**
+     * 标题
+     */
+    @immutable()
+    public readonly description: string = undefined;
     /**
      * 面包屑
      */
@@ -127,6 +134,12 @@ export class View extends Block {
      */
     @immutable()
     public readonly moreChildrenFields: Array<string> = ['$def.params', '$def.variables', '$def.logics'];
+    /**
+     * 当前View中所有组件名的缓存
+     */
+    @immutable()
+    public readonly elementNameSet: Set<string> = new Set();
+
     /**
      * @param source 需要合并的部分参数
      */
@@ -199,26 +212,40 @@ export class View extends Block {
             } catch (err) { }
         })().finally(() => this.contentPromise = undefined);
     }
-    loadAll() {
+    loadAll(enableCache = true) {
+        const isGONGHANG = utils.getGlobalEnv() === 'gonghang';
+        if (isGONGHANG) {
+            enableCache = false;
+        }
         // 如果有正在进行的 Promise，则直接返回它
         if (this.contentPromise)
             return this.contentPromise;
 
         return this.contentPromise = (async () => {
-            try {
-                const result: View = await viewService.load({
-                    path: {
-                        id: this.id,
-                    },
-                });
-
-                const temp = View.from(result, this.parent, this.page, this);
-                this.assign(temp);
-                utils.traverse((current) => {
-                    current.node.attachNodePath(true);
-                }, { node: this });
-                return this;
-            } catch (err) { }
+            const result: View = await viewService.load({
+                path: {
+                    id: this.id,
+                },
+                query: {
+                    enableCache,
+                },
+                config: { noErrorTip: true },
+            });
+            const oldLogics = this.$def.logics;
+            Object.assign(result, {
+                children: this.children,
+            });
+            const temp = View.from(result, this.parent, this.page, this);
+            const newLogics = temp.$def.logics;
+            oldLogics.forEach((logic) => {
+                if (!newLogics.find((item) => item.id === logic.id))
+                    logic.destroy();
+            });
+            this.assign(temp);
+            utils.traverse((current) => {
+                current.node.attachNodePath(true);
+            }, { node: this });
+            return this;
         })().finally(() => this.contentPromise = undefined);
     }
     isContentLoaded() {
@@ -325,7 +352,7 @@ export class View extends Block {
                 operationDesc: actionOptions?.actionDesc || `添加子页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
             },
             body,
-        });
+        }).catch(catchFn());
         this.deepPick(result.view, ['id']);
         // 添加数据
         this.addData(result);
@@ -406,21 +433,16 @@ export class View extends Block {
         if (!this.parent)
             throw Error('该子页面为根节点！');
 
-        try {
-            await viewService.delete({
-                headers: {
-                    appId: config.defaultApp?.id,
-                    operationAction: actionOptions?.actionName || 'View.delete',
-                    operationDesc: actionOptions?.actionDesc || `删除子页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
-                },
-                path: {
-                    id: this.id,
-                },
-            });
-        } catch (err) {
-            await config.defaultApp?.history.load();
-            throw err;
-        }
+        await viewService.delete({
+            headers: {
+                appId: config.defaultApp?.id,
+                operationAction: actionOptions?.actionName || 'View.delete',
+                operationDesc: actionOptions?.actionDesc || `删除子页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
+            },
+            path: {
+                id: this.id,
+            },
+        }).catch(catchFn());
 
         const index = this.parent.children.indexOf(this);
         ~index && this.parent.children.splice(index, 1);
@@ -452,7 +474,7 @@ export class View extends Block {
                 operationDesc: actionOptions?.actionDesc || `修改子页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
             },
             body,
-        });
+        }).catch(catchFn());
 
         await then?.();
         await config.defaultApp?.history.load();
@@ -468,15 +490,13 @@ export class View extends Block {
     async setName(name: string) {
         const oldName = this.name;
         const oldTempPath = this.tempPath;
-        this.assign({ name });
-        this.assign({
-            tempPath: this.parent ? `${this.parent.tempPath}/${name}` : `/${name}`,
-        });
+        const newTempPath = this.parent ? `${this.parent.tempPath}/${name}` : `/${name}`;
+        this.assign({ name, tempPath: newTempPath });
         await this.update(undefined, {
             actionDesc: `设置页面"${oldName}"的名称为"${name}"`,
         });
         if (this.page.rootView === this) {
-            this.page.assign({ name });
+            this.page.assign({ name, tempPath: newTempPath });
             await this.page.update();
         }
         // 同步权限
@@ -484,6 +504,12 @@ export class View extends Block {
             domainName: this.page.service.app.name,
             view: this,
         }).editResourceFromResourceValue(oldTempPath);
+        // 批量调整子页面的 tempPath 和权限
+        if (this.children.length) {
+            this.children.forEach(async (child: View) => {
+                await this.updateTempPath(child);
+            });
+        }
         this.page.service.emit('pageTreeChange');
         this.emit('change');
     }
@@ -522,6 +548,27 @@ export class View extends Block {
         this.page.service.emit('pageTreeChange');
         this.emit('change');
     }
+
+    /**
+     * 描述信息
+     * @param description 描述信息
+     */
+    @action('设置子页面面包屑')
+    async setDescription(description: string) {
+        const oldDescription = this.description;
+        this.assign({ description });
+        await this.update(undefined, {
+            actionDesc: `设置页面"${oldDescription}"的描述为"${description}"`,
+        });
+
+        if (this.page.rootView === this) {
+            this.page.assign({ description });
+            await this.page.update();
+        }
+
+        this.page.service.emit('pageTreeChange');
+        this.emit('change');
+    }
     /**
      * 设置该子页面为默认跳转页
      */
@@ -814,9 +861,23 @@ export class View extends Block {
                 body.$html._posIndex = +posIndex;
             }
 
+            // 生成组件名字
             traverse((current) => {
-                if (current.node.level === 'element' && current.node.name)
-                    setNewNameIfNotUnique(current.node, 'name', 'elements');
+                const ele = current.node;
+                if (ele.level !== 'element') {
+                    return;
+                }
+                // 自带ref名的组件
+                if (ele.name) {
+                    setNewNameIfNotUnique(ele, 'name', 'elements');
+                } else {
+                    if (Element.ignoreTag.includes(ele.tag)) {
+                        return;
+                    }
+                    const tagName = ele.tag.replace(Element.TAG_NAME_PREFIX_REG, '').replace(/-/g, '_');
+                    ele.name = utils.unique(tagName + '1', this.elementNameSet);
+                }
+                this.addElementName(ele.name);
             }, { node: body.$html });
         }
 
@@ -901,6 +962,40 @@ export class View extends Block {
         // config.defaultApp?.emit('saved');
     }
 
+    // 遍历页面缓存所有组件名
+    traverseAllElementName(): void {
+        this.elementNameSet.clear();
+        utils.traverse(({ node }) => {
+            node && this.elementNameSet.add(node.name);
+        }, { node: this.$html });
+    }
+
+    // 组件名是否有效
+    isValidElementName(name: string): boolean {
+        if (name) {
+            return !this.elementNameSet.has(name);
+        }
+        return false;
+    }
+
+    // 保存组件名至缓存
+    addElementName(nameOrElement: string | Element) {
+        let name: string = nameOrElement as string;
+        if (nameOrElement instanceof Element) {
+            name = nameOrElement.name;
+        }
+        return this.elementNameSet.add(name);
+    }
+
+    // 在缓存中移除组件名
+    removeElementName(nameOrElement: string | Element): void {
+        let name: string = nameOrElement as string;
+        if (nameOrElement instanceof Element) {
+            name = nameOrElement.name;
+        }
+        this.elementNameSet.delete(name);
+    }
+
     _removeDef($def: View['$def']) {
         const removedParams = this.$def.params.filter((param) => $def.params?.find((item) => param.id === item.id));
         this.$def.params = this.$def.params.filter((param) => !$def.params?.find((item) => param.id === item.id));
@@ -1032,6 +1127,26 @@ export class View extends Block {
                 this.$def.logics.push(Logic.from(logic, this));
         });
     }
+
+    // 批量调整子页面的 tempPath 和权限
+    async updateTempPath(view: View) {
+        const oldTempPath = view.tempPath;
+        view.assign({
+            tempPath: view.parent ? `${view.parent.tempPath}/${view.name}` : `/${view.name}`,
+        });
+        await view.update();
+        // 同步权限
+        new Nuims({
+            domainName: view.page.service.app.name,
+            view,
+        }).editResourceFromResourceValue(oldTempPath);
+        if (view.children.length) {
+            view.children.forEach(async (childView: View) => {
+                await view.updateTempPath(childView);
+            });
+        }
+    }
+
     /**
      * 从后端 JSON 生成规范的 View 对象
      * @param currentView 方便构建子对象时关联，主要在 load 中使用

package/src/types/page/ViewParam.ts

@@ -5,6 +5,25 @@ import { getBasicTypeDefaultValue } from '../data/basicTypes';
 import { viewService } from '../../service/page';
 import { View } from './View';
 import { schemaService } from '../../service/common';
+import { refreshPages, refreshView } from '../cache';
+import { BusinessCode } from '../enum';
+
+export function catchFn(view: View) {
+    return async (err: any) => {
+        const code = err?.code;
+        // 节点已存在； 节点不存在
+        if([BusinessCode.ElementExist, BusinessCode.ElementNotExist].includes(code)) {
+            await refreshView(view);
+        } else if(code === BusinessCode.ParentElementNotExist) {  // 父节点不存在。视图添加变量，发现视图不存在
+            await refreshPages();
+        } else 
+            config.defaultApp?.emit('saved', err);
+
+        config.defaultApp?.history.load();
+
+        throw err;
+    }
+}
 
 /**
  * 页面输入参数
@@ -56,7 +75,7 @@ export class ViewParam extends Param {
                 operationDesc: actionOptions?.actionDesc || `添加页面"${this.view.name}"输入参数"${this.name}"`,
             },
             body,
-        });
+        }).catch(catchFn(this.view));
         // convert2RefType(result.schema);
         this.deepPick(result, ['id']);
         this.assign({ code: this.genCode() });
@@ -88,7 +107,7 @@ export class ViewParam extends Param {
                     query: {
                         id: this.id,
                     },
-                });
+                }).catch(catchFn(this.view));
             } catch(err) {
                 await config.defaultApp?.history.load();
                 throw err;
@@ -129,7 +148,7 @@ export class ViewParam extends Param {
                 operationDesc: actionOptions?.actionDesc || `修改页面"${this.view.name}"输入参数"${this.name}"`,
             },
             body,
-        });
+        }).catch(catchFn(this.view));
         // convert2RefType(result.schema);
         // this.plainAssign(result);
 

package/src/types/page/ViewVariable.ts

@@ -1,10 +1,10 @@
 import { immutable, excludedInJSON, action } from '../decorators';
-import { config, history, utils, LEVEL_ENUM, Vertex, Logic, Variable, View, Schema, ActionOptions } from '..';
-import { paramService } from '../../service/logic';
+import { config, utils, Logic, Variable, View, Schema, ActionOptions } from '..';
 import { viewService } from '../../service/page';
-import { convert2RefType, convert2SchemaType } from '../data/dataTypeUtils';
+import { convert2RefType } from '../data/dataTypeUtils';
 import { getBasicTypeDefaultValue } from '../data/basicTypes';
 import { schemaService } from '../../service/common';
+import { catchFn } from './ViewParam';
 
 /**
  * 页面局部变量
@@ -42,7 +42,7 @@ export class ViewVariable extends Variable {
 
         const body = this.toJSON('', ['ideVersion', 'editable']);
         body.viewId = this.view.id;
-        // convert2SchemaType(body.schema);
+
         utils.logger.debug('添加页面局部变量', body);
         const result: ViewVariable = await viewService.createViewVariable({
             headers: {
@@ -51,8 +51,7 @@ export class ViewVariable extends Variable {
                 operationDesc: actionOptions?.actionDesc || `添加页面"${this.view.name}"局部变量"${this.name}"`,
             },
             body,
-        });
-        // convert2RefType(result.schema);
+        }).catch(catchFn(this.view));
         this.deepPick(result, ['id']);
         this.assign({ code: this.genCode() });
 
@@ -73,21 +72,16 @@ export class ViewVariable extends Variable {
         config.defaultApp?.emit('saving');
 
         if (this.id) {
-            try {
-                await viewService.deleteViewVariable({
-                    headers: {
-                        appId: config.defaultApp?.id,
-                        operationAction: actionOptions?.actionName || 'ViewVariable.delete',
-                        operationDesc: actionOptions?.actionDesc || `删除页面"${this.view.name}"局部变量"${this.name}"`,
-                    },
-                    query: {
-                        id: this.id,
-                    },
-                });
-            } catch (err) {
-                await config.defaultApp?.history.load();
-                throw err;
-            }
+            await viewService.deleteViewVariable({
+                headers: {
+                    appId: config.defaultApp?.id,
+                    operationAction: actionOptions?.actionName || 'ViewVariable.delete',
+                    operationDesc: actionOptions?.actionDesc || `删除页面"${this.view.name}"局部变量"${this.name}"`,
+                },
+                query: {
+                    id: this.id,
+                },
+            }).catch(catchFn(this.view));
         }
 
         const { variables } = this.view.$def;
@@ -113,7 +107,6 @@ export class ViewVariable extends Variable {
         delete body.ideVersion;
         delete body.editable;
         body.viewId = this.view.id;
-        // convert2SchemaType(body.schema);
         utils.logger.debug('修改页面局部变量', body);
         const result = await viewService.updateViewVariable({
             headers: {
@@ -122,9 +115,7 @@ export class ViewVariable extends Variable {
                 operationDesc: actionOptions?.actionDesc || `修改页面"${this.view.name}"局部变量"${this.name}"`,
             },
             body,
-        });
-        // convert2RefType(result.schema);
-        // this.plainAssign(result);
+        }).catch(catchFn(this.view));
 
         await config.defaultApp?.history.load();
         config.defaultApp?.emit('saved');
@@ -190,7 +181,6 @@ export class ViewVariable extends Variable {
             typeInstantiation: undefined,
         });
         Object.assign(this.schema, schema);
-        // if (this.defaultValue)
         this.assign({ defaultValue: getBasicTypeDefaultValue() });
         try {
             await this.update(undefined, {