@lcap/nasl 0.3.9 → 0.3.10-beta.nocache1

package/src/types/logic/translator_backup.js

@@ -1,8 +1,6 @@
 import generate from '@babel/generator';
 import * as babel from '@babel/core';
-import { TransforClientQuery as genQuery } from 'apollo-plugin-loader';
-import { Vertex, vertexesMap, utils } from '..';
-import { getQuerySchemaMap } from './tools';
+import { Vertex, utils } from '..';
 
 function switchCase2If(cases) {
     const cas = cases.shift();
@@ -81,9 +79,7 @@ export default function (source) {
         } else if (node.type === 'MemberExpression') {
             return checkThis(node.object);
         } else if (node.type === 'CallExpression') {
-            (node.arguments || []).forEach((arg) => {
-                return checkThis(arg);
-            });
+            (node.arguments || []).forEach((arg) => checkThis(arg));
         }
     }
     function safeGenerate(node) {
@@ -586,7 +582,7 @@ export default function (source) {
                         const jsBlock_${index} = async () => {
                             ${node.code}
                         }
-                    
+
                         await jsBlock_${index}();
                     }`,
                         {
@@ -600,16 +596,9 @@ export default function (source) {
             }
         });
 
-        // console.info("JSON generate:", JSON.stringify(logic.body));
-        // console.log(generate({ type: 'Program', body: logic.body }).code);
-
         return `methods['${logic.name}'] = async function (${logic.params.map((param) => param.name).join(', ')}) {
-            ${logic.params.length ? logic.params.map((param) => {
-        return `${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) => {
-        return `let ${variable.name} = this.$genInitFromSchema(${JSON.stringify(variable.schema)}, ${JSON.stringify(variable.defaultValue)});`;
-    }).join('\n') + '' : ''}
+            ${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)});
             ${generate({ type: 'Program', body: logic.body }).code}
         }`;

package/src/types/nuims/Nuims.ts

@@ -17,7 +17,7 @@ interface RoleItem extends Role {
     toggling?: Boolean,
 }
 
-interface Permission{
+interface Permission {
     DomainName: string,
     PermissionId: string,
     PermissionValue: string,
@@ -79,7 +79,7 @@ export class Nuims {
         }
     }
 
-    async getInitRoles() {
+    async getInitRoles(auto: unknown) {
         let isCreated = false;
         let resource = await this.getResource();
         if (!resource) {
@@ -99,9 +99,15 @@ export class Nuims {
                 await this.bindRolesAndPermissions(role, permission);
             }
             roleName2Permission.set(role.RoleName, permission);
-            // 创建 /dashboard 资源时自动关联 DEV-AdminRole 权限
-            if (isCreated && (ResourceValue === '/dashboard' || ((ResourceValue === '/index' || ResourceValue === '/user') && config.scope === 'h5')) && role.RoleName === 'DEV-AdminRole') {
-                await this.attachPermissionResourceAction();
+            if (auto) {
+                if ((ResourceValue === '/dashboard' || ((ResourceValue === '/index' || ResourceValue === '/user') && config.scope === 'h5')) && role.RoleName === 'DEV-AdminRole') {
+                    await this.attachPermissionResourceAction();
+                }
+            } else {
+                // 创建 /dashboard 资源时自动关联 DEV-AdminRole 权限
+                if (isCreated && (ResourceValue === '/dashboard' || ((ResourceValue === '/index' || ResourceValue === '/user') && config.scope === 'h5')) && role.RoleName === 'DEV-AdminRole') {
+                    await this.attachPermissionResourceAction();
+                }
             }
             roleItem.permission = permission;
             const resources = await this.getResourcesFromPermission(permission);

package/src/types/page/Element.ts

@@ -1,15 +1,14 @@
-// import stringify = require('json-stringify-safe');
 import { action, circular, excludedInJSON, immutable } from '../decorators';
-import { config, history, utils, LEVEL_ENUM, Vertex, PackageJSON, App, Page, DataNode, View, Attr, Directive, Event, ExpressionNode, Logic, dataTypesMap, Entity, LogicItem, ActionOptions, ACTION_MODE, Nuims, Structure } from '..';
+import { config, utils, LEVEL_ENUM, Vertex, View, Attr, Directive, Event, ExpressionNode, dataTypesMap, LogicItem, ActionOptions, ACTION_MODE, Nuims, Structure } from '..';
 import * as compiler from 'vue-template-compiler';
 import * as json5 from 'json5';
-import { elementService, attributeService, eventService, directiveService } from '../../service/page';
+import { elementService } from '../../service/page';
 import { vertexsMap } from '../cacheData';
 import Variable from '../logic/Variable';
 import * as babelParser from '@babel/parser';
-import { traverse } from '../utils';
 import { isPlainObject, cloneDeep, mapValues } from 'lodash';
-import * as utilsAll from '../../../src/types/utils/string';
+import { refreshHtml } from '../cache';
+import { BusinessCode } from '../enum';
 
 export interface ElementToVueOptions {
     indentStyle?: 'space' | 'tab';
@@ -29,6 +28,18 @@ export interface ParseContext {
     [key: string]: any;
 }
 
+export function catchFn(view: View) {
+    return async (err: any) => {
+        if(err.code !== BusinessCode.HasReferenced)  // 节点被引用，不用刷新数据
+            await refreshHtml(view);
+        else
+            config.defaultApp?.emit('saved', err);
+
+        config.defaultApp?.history.load();
+        throw err;
+    }
+}
+
 /**
  * 前端页面元素
  * @example
@@ -150,9 +161,6 @@ export class Element extends Vertex {
     constructor(source?: Partial<Element>) {
         super();
         source && this.assign(source);
-        // 为了给生成的节点使用
-        // !this.id && this.assign({ id: uuidv4() });
-        // this.assign({ id: 'temp-' + uuidv4() });
     }
     assign(source?: any) {
         ['attrList', 'eventList', 'directiveList', 'children'].forEach((key) => {
@@ -172,7 +180,6 @@ export class Element extends Vertex {
         }
 
         config.defaultApp?.emit('saving');
-        try {
             if (actionOptions?.actionMode !== ACTION_MODE.undoRedo) {
                 const body = this.toJSON();
                 body.parentId = this.parent && this.parent.id;
@@ -185,15 +192,7 @@ export class Element extends Vertex {
                         operationDesc: `添加组件"${this.getElementTitle()}"`,
                     },
                     body,
-                });
-
-                // Nuims createResource
-                // Element 对应资源增删在 undo/redo 情况下可能存在权限丢失的情况
-                // 暂时只增不减
-                // new Nuims({
-                //     domainName: this.view.page.service.app.name,
-                //     element: this,
-                // }).createResource();
+                }).catch(catchFn(this.view));
 
                 this.deepPick(result, ['id', 'parentId', 'elementId']);
                 // attr,directive,event的id,exprssion需要合并
@@ -220,14 +219,6 @@ export class Element extends Vertex {
             config.defaultApp?.emit('saved');
             }
             return this;
-        } catch (err) {
-            if (this.view) {
-                await this.view.load();
-                this.view.emit('change');
-                config.defaultApp?.emit('saved');
-            }
-            throw err;
-        }
     }
     /**
      * 删除元素
@@ -248,7 +239,6 @@ export class Element extends Vertex {
 
         if (actionOptions?.actionMode !== ACTION_MODE.undoRedo) {
             if (this.id) {
-                try {
                     await elementService.delete({
                         headers: {
                             appId: config.defaultApp?.id,
@@ -258,19 +248,7 @@ export class Element extends Vertex {
                         query: {
                             id: this.id,
                         },
-                    });
-                } catch (err) {
-                    await config.defaultApp?.history.load();
-                    throw err;
-                }
-
-                // Nuims deleteResource
-                // Element 对应资源增删在 undo/redo 情况下可能存在权限丢失的情况
-                // 暂时只增不减
-                // new Nuims({
-                //     domainName: this.view.page.service.app.name,
-                //     element: this,
-                // }).deleteResources();
+                    }).catch(catchFn(this.view));
             }
         }
 
@@ -295,7 +273,6 @@ export class Element extends Vertex {
             config.defaultApp?.emit('saving');
 
             source && this.assign(source);
-            try {
                 if (actionOptions?.actionMode !== ACTION_MODE.undoRedo) {
                     const body = this.toPlainJSON();
                     utils.logger.debug('修改组件', body);
@@ -306,28 +283,41 @@ export class Element extends Vertex {
                             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, // JSON.parse(JSON.stringify(this)),
+                    operationBeforeImage: null,
                     operationAfterImage: null,
                     operationDesc: `修改组件"${this.getElementTitle()}"`,
                 });
 
                 config.defaultApp?.emit('saved');
                 return this;
-            } catch (err) {
-                if (this.view) {
-                    await this.view.load();
-                    this.view.emit('change');
-                    config.defaultApp?.emit('saved');
-                }
-                throw err;
-            }
     }
+
+        /**
+     * 按当前 id 加载逻辑数据
+     */
+    async load() {
+        if (!this.id)
+            return;
+
+        const result = await elementService.load({
+            headers: {
+                appId: config.defaultApp?.id,
+            },
+            query: {
+                id: this.id,
+            },
+            config: { noErrorTip: true },
+        });
+        const newElement = Element.from(result, this.parent, this.view);
+        this.assign(newElement);
+    }
+
     async move(options: {
         parentId?: string,
         _posIndex?: number,
@@ -365,11 +355,16 @@ export class Element extends Vertex {
             }
 
             config.defaultApp?.emit('element.moved');
+            config.defaultApp?.emit('saved');
         } catch (err) {
             if (this.view) {
                 await this.view.load();
                 this.view.emit('change');
             }
+            config.defaultApp?.emit('saved', {
+                action: 'move',
+                err,
+            });
             throw err;
         }
     }
@@ -383,7 +378,6 @@ export class Element extends Vertex {
 
         const index = this.parent.children.indexOf(this);
         const newNode = Element.fromHTML(code, this.parent, this.view);
-        
 
         const mergeExpression = (originList: Array<Attr|Directive>, newList: Array<Attr|Directive>) => {
             newList.forEach((item) => {
@@ -437,11 +431,11 @@ export class Element extends Vertex {
         };
 
         const arrayComp = this.findElementsByTag('u-modal');
-        const existingNames = Object.values(mapValues(arrayComp, function(o) { return o.name; }));
+        const existingNames = Object.values(mapValues(arrayComp, (o) => o.name));
         // 处理弹窗组件的命名问题
         if (newNode.tag === 'u-modal') {
             Object.assign(newNode, {
-                name: utilsAll.unique('saveModal1', existingNames as any),
+                name: utils.unique('saveModal1', existingNames as any),
             });
         }
 
@@ -501,11 +495,14 @@ export class Element extends Vertex {
         await this.update(undefined, {
             actionDesc: `设置组件"${this.getElementTitle()}"的名称为"${name}"`,
         });
-        // 同步权限
-        new Nuims({
-            domainName: this.view.page.service.app.name,
-            element: this,
-        }).editResourceFromResourceValue(oldName ? `${this.view.tempPath}/${oldName}` : null);
+        
+        if (!(window as any).globalData.hasUserCenter) {
+            // 同步权限
+            new Nuims({
+                domainName: this.view.page.service.app.name,
+                element: this,
+            }).editResourceFromResourceValue(oldName ? `${this.view.tempPath}/${oldName}` : null);
+        }
 
         this.view && this.view.emit('change');
         if (this.view && this.view.page && this.view.page.service) {
@@ -554,9 +551,7 @@ export class Element extends Vertex {
     async setAttr(name: string, type: 'string' | 'static' | 'dynamic', value?: any) {
         let attr = this.getAttr(name);
         //
-        if (value === undefined) {
-
-        } else {
+        if (value !== undefined) {
             if (typeof value !== 'string')
                 value = JSON.stringify(value);
 
@@ -567,7 +562,7 @@ export class Element extends Vertex {
                 });
                 await attr.update(undefined, {
                     actionDesc: `设置组件"${this.getElementTitle()}"属性"${attr.name}"的值为"${attr.value}"`,
-                });
+                }).catch(catchFn(this.view));
             } else {
                 attr = Attr.from({
                     name,
@@ -577,7 +572,7 @@ export class Element extends Vertex {
                 }, this);
                 await attr.create(undefined, {
                     actionDesc: `设置组件"${this.getElementTitle()}"属性"${attr.name}"的值为"${attr.value}"`,
-                });
+                }).catch(catchFn(this.view));
                 this.attrList.push(attr);
             }
         }
@@ -594,7 +589,7 @@ export class Element extends Vertex {
 
         await event.create(undefined, Object.assign({
             actionDesc: `添加组件"${this.getElementTitle()}"事件"${event.name}"`,
-        }, actionOptions));
+        }, actionOptions)).catch(catchFn(this.view));
         event = Event.from(event, this);
         this.eventList.push(event);
 
@@ -617,7 +612,7 @@ export class Element extends Vertex {
 
         await event.delete(undefined, Object.assign({
             actionDesc: `删除组件"${this.getElementTitle()}"事件"${event.name}"`,
-        }, actionOptions));
+        }, actionOptions)).catch(catchFn(this.view));
         const index = this.eventList.indexOf(event);
         ~index && this.eventList.splice(index, 1);
 
@@ -635,7 +630,7 @@ export class Element extends Vertex {
         const directive = new Directive(data);
         await directive.create(undefined, Object.assign({
             actionDesc: `添加组件"${this.getElementTitle()}"指令"${directive.name}"`,
-        }, actionOptions));
+        }, actionOptions)).catch(catchFn(this.view));
         this.directiveList.push(Directive.from(directive, this));
 
         this.view && this.view.emit('change');
@@ -652,7 +647,7 @@ export class Element extends Vertex {
 
         await directive.delete(undefined, Object.assign({
             actionDesc: `删除组件"${this.getElementTitle()}"属性"${directive.name}"`,
-        }, actionOptions));
+        }, actionOptions)).catch(catchFn(this.view));
         const index = this.directiveList.indexOf(directive);
         ~index && this.directiveList.splice(index, 1);
 
@@ -839,7 +834,7 @@ export class Element extends Vertex {
     findElementsByTagInChildren(children: Array<any>, tag: string, existingNames: Array<any>) {
         for (const child of children) {
             const result = child.findElementByTag(tag);
-           
+
             if (child.children) {
                 this.findElementsByTagInChildren(child.children, tag, existingNames);
             }
@@ -892,8 +887,6 @@ export class Element extends Vertex {
                 }
             }
 
-            // if (astNode.tag === 'template')
-            //     astNode.tag = 'div';
             element = new Element({
                 tag: astNode.tag,
                 name: astNode.attrsMap.ref,
@@ -934,7 +927,6 @@ export class Element extends Vertex {
                     }
                 }
                 element.attrList.push(attr);
-                // element.attrMap[attr.name] = attr;
             });
 
             // compiler 处理:value.sync 时会加上update:value事件，需要过滤
@@ -946,10 +938,6 @@ export class Element extends Vertex {
                     value,
                     logicId: value[0] === '$' ? undefined : value,
                 }, element));
-                // element.eventMap[name] = new Event({
-                //     name,
-                //     value: oldEvent.value,
-                // });
             });
 
             astNode.directives && astNode.directives.forEach((directive) => {
@@ -976,7 +964,6 @@ export class Element extends Vertex {
                         arg: directive.arg,
                         modifiers: directive.modifiers,
                     }, element));
-                    // element.directiveMap[directive.name] = );
                 }
             });
 

package/src/types/page/Event.ts

@@ -3,10 +3,7 @@ import { action, circular, excludedInJSON, immutable } from '../decorators';
 import { config, history, utils, LEVEL_ENUM, Vertex, PackageJSON, App, Page, DataNode, View, Element, ExpressionNode, Logic, genFinalCode, ActionOptions, ACTION_MODE } from '..';
 import { elementService, attributeService, eventService, directiveService } from '../../service/page';
 import * as babel from '@babel/core';
-import { traverse } from '../utils';
-import generate from '@babel/generator';
 import { vertexsMap } from '../cacheData';
-import Variable from '../logic/Variable';
 
 /**
  * 前端组件事件

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,13 +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 enums = res.enums as Array<Enum>;
         if (enums && enums.length) {
@@ -153,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);
@@ -170,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 });
@@ -179,7 +195,7 @@ export class Page extends Vertex {
                 });
             Promise.all(tasks);
         }
-    
+
         await then?.();
         this.service.emit('pageTreeChange');
 
@@ -187,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;
@@ -215,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 });
@@ -223,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;
@@ -240,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);
@@ -279,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');
@@ -292,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');
     }
@@ -356,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;