@lcap/nasl 0.3.9-beta → 0.3.10-beta.oom2

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;
+    };
+}
 
 /**
  * 页面（入口页）类，后端路由控制
@@ -95,22 +112,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 interfaces = res.interfaces as Array<Interface>;
-        if (interfaces && interfaces.length) {
-            interfaces.forEach((item, index) => {
-                const itface = interfaces[index] = Interface.from(item, microService);
-                postServiceType(itface);
-            });
-            microService.interfaces.unshift(...interfaces);
-            microService.globalLogic.globalLogics.unshift(...interfaces);
-            microService.emit('interfacesChange');
-        }
 
         const enums = res.enums as Array<Enum>;
         if (enums && enums.length) {
@@ -132,6 +139,19 @@ export class Page extends Vertex {
             microService.data.structures.unshift(...structures);
             updateDataTypeList();
         }
+
+        const interfaces = res.interfaces as Array<Interface>;
+        if (interfaces && interfaces.length) {
+            interfaces.forEach((item, index) => {
+                const itface = interfaces[index] = Interface.from(item, microService);
+                postServiceType(itface);
+            });
+            microService.interfaces.unshift(...interfaces);
+            microService.globalLogic.globalLogics.unshift(...interfaces);
+            microService.mountResolverOnEntity();
+            microService.mountResolverOnInterface();
+            microService.emit('interfacesChange');
+        }
     }
 
     /**
@@ -149,8 +169,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);
@@ -166,8 +186,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 });
@@ -175,7 +195,7 @@ export class Page extends Vertex {
                 });
             Promise.all(tasks);
         }
-    
+
         await then?.();
         this.service.emit('pageTreeChange');
 
@@ -183,10 +203,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;
@@ -211,7 +231,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 });
@@ -219,12 +239,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;
@@ -236,21 +256,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);
@@ -275,7 +290,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');
@@ -288,19 +303,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);
             });
-        this.assign({ isIndex: true });
-        tasks.push(this.update(undefined, {
-            actionDesc: `设置页面"${this.name}"为首页`,
-        }));
-        await Promise.all(tasks);
+        });
 
-        this.service.emit('pageTreeChange');
+        // 去掉旧首页
+        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}"为首页`,
+            });
+        } catch (e) {
+            // 恢复状态
+            this.assign({ isIndex: false });
+        }
+
+        this.service.emit('pageTreeChange');
         await config.defaultApp?.history.load();
         config.defaultApp?.emit('saved');
     }
@@ -352,8 +389,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';
 
 /**
  * 子页面类，前端路由控制
@@ -199,26 +200,36 @@ export class View extends Block {
             } catch (err) { }
         })().finally(() => this.contentPromise = undefined);
     }
-    loadAll() {
+    loadAll(enableCache = true) {
         // 如果有正在进行的 Promise，则直接返回它
         if (this.contentPromise)
             return this.contentPromise;
 
         return this.contentPromise = (async () => {
-            try {
                 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;
-            } catch (err) { }
         })().finally(() => this.contentPromise = undefined);
     }
     isContentLoaded() {
@@ -277,16 +288,6 @@ export class View extends Block {
     /* 绑定数据结构和接口 */
     addData(res: any) {
         const microService = this.parent.page.service.app.firstMicroService;
-        const interfaces = res.interfaces as Array<Interface>;
-        if (interfaces && interfaces.length) {
-            interfaces.forEach((item, index) => {
-                const itface = interfaces[index] = Interface.from(item, microService);
-                postServiceType(itface);
-            });
-            microService.interfaces.unshift(...interfaces);
-            microService.emit('interfacesChange');
-        }
-
         const enums = res.enums as Array<Enum>;
         if (enums && enums.length) {
             enums.forEach((item, index) => enums[index] = Enum.from(item, microService));
@@ -307,6 +308,19 @@ export class View extends Block {
             microService.data.structures.unshift(...structures);
             updateDataTypeList();
         }
+
+        const interfaces = res.interfaces as Array<Interface>;
+        if (interfaces && interfaces.length) {
+            interfaces.forEach((item, index) => {
+                const itface = interfaces[index] = Interface.from(item, microService);
+                postServiceType(itface);
+            });
+            microService.interfaces.unshift(...interfaces);
+            microService.globalLogic.globalLogics.unshift(...interfaces);
+            microService.mountResolverOnEntity();
+            microService.mountResolverOnInterface();
+            microService.emit('interfacesChange');
+        }
     }
 
     @action('添加子页面')
@@ -322,7 +336,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);
@@ -403,7 +417,6 @@ export class View extends Block {
         if (!this.parent)
             throw Error('该子页面为根节点！');
 
-        try {
             await viewService.delete({
                 headers: {
                     appId: config.defaultApp?.id,
@@ -413,11 +426,7 @@ export class View extends Block {
                 path: {
                     id: this.id,
                 },
-            });
-        } catch (err) {
-            await config.defaultApp?.history.load();
-            throw err;
-        }
+            }).catch(catchFn());
 
         const index = this.parent.children.indexOf(this);
         ~index && this.parent.children.splice(index, 1);
@@ -449,7 +458,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();

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

@@ -5,6 +5,7 @@ import { viewService } from '../../service/page';
 import { convert2RefType, convert2SchemaType } from '../data/dataTypeUtils';
 import { getBasicTypeDefaultValue } from '../data/basicTypes';
 import { schemaService } from '../../service/common';
+import { catchFn } from './ViewParam';
 
 /**
  * 页面局部变量
@@ -51,7 +52,7 @@ export class ViewVariable extends Variable {
                 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() });
@@ -73,7 +74,6 @@ export class ViewVariable extends Variable {
         config.defaultApp?.emit('saving');
 
         if (this.id) {
-            try {
                 await viewService.deleteViewVariable({
                     headers: {
                         appId: config.defaultApp?.id,
@@ -83,11 +83,7 @@ export class ViewVariable extends Variable {
                     query: {
                         id: this.id,
                     },
-                });
-            } catch (err) {
-                await config.defaultApp?.history.load();
-                throw err;
-            }
+                }).catch(catchFn(this.view));
         }
 
         const { variables } = this.view.$def;
@@ -122,7 +118,7 @@ export class ViewVariable extends Variable {
                 operationDesc: actionOptions?.actionDesc || `修改页面"${this.view.name}"局部变量"${this.name}"`,
             },
             body,
-        });
+        }).catch(catchFn(this.view));
         // convert2RefType(result.schema);
         // this.plainAssign(result);
 

package/src/types/permission/Permission.ts

@@ -0,0 +1,112 @@
+import { immutable } from '../decorators';
+import { View, Element } from '..';
+import permissionService from '../../service/permission';
+
+
+export class Permission {
+    /**
+     * App Name
+     */
+    @immutable()
+    public readonly domainName: string = undefined;
+    /**
+     * 上报权限后的资源id
+     */
+    @immutable()
+    public readonly resourceId: string = undefined;
+
+    /**
+     * 应用 id
+     */
+    @immutable()
+    public readonly serviceId: string = undefined;
+
+    /**
+     * view
+     */
+    @immutable()
+    public readonly view: View = undefined;
+
+    /**
+     * element
+     */
+    @immutable()
+    public readonly element: Element = undefined;
+
+    /**
+     * @param source 需要合并的部分参数
+     */
+    constructor(source?: Partial<Permission>) {
+        const { domainName } = source;
+        Object.assign(this, source);
+        if (!domainName) {
+            throw new Error('Permission need domainName!');
+        }
+    }
+
+    async createDefaultRoleFromRoleName(roleName: string) {
+        if (!roleName)
+            return;
+        return await permissionService.createRole({
+            body: {
+                name: roleName,
+                serviceId: this.serviceId,
+            },
+        });
+    }
+
+    async updateRoleName(roleId: string, roleName: string) {
+        return await permissionService.updateRole({
+            body: {
+                id: roleId,
+                name: roleName,
+                serviceId: this.serviceId,
+            }
+        })
+    }
+
+    /**
+     * 
+     * @param query {
+     *   resourceId
+     *   roleId
+     * }
+     */
+    async attachPermissionResource(query: Object) {
+        return await permissionService.attachPermissionResourceAction({ query });
+    }
+
+    async detachPermissionResource(query: Object) {
+        return await permissionService.detachPermissionResourceAction({ query });
+    }
+
+    async getInitRoles(resourceId: string) {
+        return await permissionService.getRoles({ 
+            query: { 
+                serviceId: this.serviceId, 
+                resourceId,
+            } 
+        });
+    }
+
+    async attachDevRole(resourceId: string) {
+        const data: any = await this.getInitRoles(resourceId)|| [];
+        let roleId;
+        data.forEach((item: any) => {
+            if (item.name === 'DEV-AdminRole') {
+                roleId = item.id;
+            }
+        })
+        // 获取权限树资源Id
+        if (roleId) {
+            // 默认角色开启
+            await this.attachPermissionResource({
+                resourceId,
+                roleId,
+            });
+            await this.getInitRoles(resourceId);
+        }
+    }
+}
+
+export default Permission;