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

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,14 +1,15 @@
-// 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 } from 'lodash';
+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';
@@ -28,6 +29,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
@@ -142,15 +155,13 @@ export class Element extends Vertex {
      */
     @immutable()
     public readonly children?: Array<Element> = [];
+
     /**
      * @param source 需要合并的部分参数
      */
     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) => {
@@ -170,7 +181,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;
@@ -183,15 +193,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需要合并
@@ -218,14 +220,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;
-        }
     }
     /**
      * 删除元素
@@ -246,7 +240,6 @@ export class Element extends Vertex {
 
         if (actionOptions?.actionMode !== ACTION_MODE.undoRedo) {
             if (this.id) {
-                try {
                     await elementService.delete({
                         headers: {
                             appId: config.defaultApp?.id,
@@ -256,19 +249,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));
             }
         }
 
@@ -293,7 +274,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);
@@ -304,28 +284,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,
@@ -363,11 +356,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;
         }
     }
@@ -381,6 +379,7 @@ 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) => {
                 const originItem = originList.find((originItem) => originItem.name === item.name);
@@ -432,6 +431,15 @@ export class Element extends Vertex {
             }
         };
 
+        const arrayComp = this.findElementsByTag('u-modal');
+        const existingNames = Object.values(mapValues(arrayComp, (o) => o.name));
+        // 处理弹窗组件的命名问题
+        if (newNode.tag === 'u-modal') {
+            Object.assign(newNode, {
+                name: utilsAll.unique('saveModal1', existingNames as any),
+            });
+        }
+
         traverseMergeNode(this, newNode);
         ~index && this.parent.children.splice(index + 1, 0, newNode);
         this.parent.children.forEach((item, index) => {
@@ -488,11 +496,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) {
@@ -541,9 +552,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);
 
@@ -554,7 +563,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,
@@ -564,7 +573,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);
             }
         }
@@ -581,7 +590,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);
 
@@ -604,7 +613,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);
 
@@ -622,7 +631,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');
@@ -639,7 +648,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);
 
@@ -808,6 +817,33 @@ export class Element extends Vertex {
             }
         }
     }
+
+    findElementsByTag(tag: string): Array<any> {
+        let existingNames: Array<any> = [];
+        existingNames = this.findElementsByTagCurrent(tag, existingNames);
+        this.findElementsByTagInChildren(this.view.$html.children, tag, existingNames);
+        return existingNames;
+    }
+
+    findElementsByTagCurrent(tag: string, existingNames: Array<any>) {
+        if (this.tag === tag) {
+            existingNames.push(this);
+        }
+        return existingNames;
+    }
+
+    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);
+            }
+            if (result) {
+                existingNames.push(result);
+            }
+        }
+    }
     /**
      * 从 Vue 的 ASTNode 转换成 ASL 元素
      * @param astNode Vue 的 ASTNode
@@ -852,8 +888,6 @@ export class Element extends Vertex {
                 }
             }
 
-            // if (astNode.tag === 'template')
-            //     astNode.tag = 'div';
             element = new Element({
                 tag: astNode.tag,
                 name: astNode.attrsMap.ref,
@@ -894,7 +928,6 @@ export class Element extends Vertex {
                     }
                 }
                 element.attrList.push(attr);
-                // element.attrMap[attr.name] = attr;
             });
 
             // compiler 处理:value.sync 时会加上update:value事件，需要过滤
@@ -906,10 +939,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) => {
@@ -936,7 +965,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';
 
 /**
  * 前端组件事件