@lcap/nasl 0.3.9 → 0.3.10-beta

package/src/types/page/View.ts

@@ -1,5 +1,6 @@
+
 import { immutable, circular, action, excludedInJSON } from '../decorators';
-import { config, history, LEVEL_ENUM, Vertex, PackageJSON, App, Enum, Service, WebService, Structure, Page, Element, utils, ViewParam, ViewVariable, Lifecycle, genFinalCode, generator, Nuims, ActionOptions, ACTION_MODE, vertexsMap, updateDataTypeList, Interface } from '..';
+import { config, history, LEVEL_ENUM, Vertex, PackageJSON, App, Enum, Service, WebService, Structure, Page, Element, utils, ViewParam, ViewVariable, Lifecycle, genFinalCode, generator, Nuims, ActionOptions, ACTION_MODE, vertexsMap, updateDataTypeList, Interface, LogicItem } from '..';
 import Block from './Block';
 import { viewService } from '../../service/page';
 import { Param } from '../logic/Param';
@@ -16,6 +17,15 @@ import * as babel from '@babel/core';
 import view from '@/service/page/view';
 import Entity from '../data/Entity';
 import { postServiceType } from '../../service/common/preprocess';
+export interface FrontEndsourceMap {
+    [id: string]: {
+        isLogic: boolean,
+        node: LogicItem,
+        from: number,
+        to: number,
+    }
+}
+import { catchFn } from './Page';
 
 /**
  * 子页面类，前端路由控制
@@ -111,6 +121,9 @@ export class View extends Block {
      */
     @excludedInJSON()
     public contentPromise: Promise<any> = undefined;
+
+    @excludedInJSON()
+    public sourceMap: FrontEndsourceMap = {};
     /**
      * 输入参数
      */
@@ -195,30 +208,41 @@ export class View extends Block {
                 // def 情况比较特殊，需要单独处理，防止逻辑重新加载
                 this._syncDef($def);
                 this.attachNodePath(true);
+                this.toVueOptions();
                 return this;
             } 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() {
@@ -325,7 +349,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,7 +430,6 @@ export class View extends Block {
         if (!this.parent)
             throw Error('该子页面为根节点！');
 
-        try {
             await viewService.delete({
                 headers: {
                     appId: config.defaultApp?.id,
@@ -416,11 +439,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);
@@ -452,7 +471,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();
@@ -662,7 +681,6 @@ export class View extends Block {
         let componentOptions = 'const componentOptions = {};';
         if (this.script)
             componentOptions = this.script.trim().replace(/export default |module\.exports +=/, 'const componentOptions = ');
-
         const $def = JSON.parse(JSON.stringify(this.$def));
         $def.title = this.title;
         $def.crumb = this.crumb;
@@ -688,10 +706,16 @@ export class View extends Block {
         //         );
         //     }
         // }, { node: $def }, { mode: 'anyObject' });
-        return `${componentOptions}
-        ${genFinalCode(translator($def), options && options.finalCode)}
+        const {
+            output,
+            sourceMap,
+        } = translator($def, this.script);
+        return {
+            script: `${componentOptions}${genFinalCode(output, options && options.finalCode)}
         export default componentOptions;
-`;
+`,
+            sourceMap,
+        };
     }
     /**
      * 转换成 Vue 文件
@@ -725,9 +749,12 @@ export class View extends Block {
      * @TODO 后面 template 可以优化成 render 函数
      */
     toVueOptions(options?: ElementToVueOptions) {
+        const { script, sourceMap } = this.toScript(options);
+        this.sourceMap = sourceMap;
         return {
             template: this.$html.toVue(options),
-            script: this.toScript(options),
+            script,
+            sourceMap,
             // definition: JSON.stringify(this.$def),
         };
     }

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;

package/tsconfig.json

@@ -8,7 +8,7 @@
         "skipLibCheck": true,
         "esModuleInterop": true,
         "allowJs": true,
-        "allowSyntheticDefaultImports": false,
+        "allowSyntheticDefaultImports": true,
         "experimentalDecorators": true,
         "resolveJsonModule": true,
         "sourceMap": true,