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

package/out/types/page/Element.js

@@ -25,8 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Element = void 0;
-// import stringify = require('json-stringify-safe');
+exports.Element = exports.catchFn = void 0;
 const decorators_1 = require("../decorators");
 const __1 = require("..");
 const compiler = __importStar(require("vue-template-compiler"));
@@ -35,6 +34,19 @@ const page_1 = require("../../service/page");
 const cacheData_1 = require("../cacheData");
 const babelParser = __importStar(require("@babel/parser"));
 const lodash_1 = require("lodash");
+const cache_1 = require("../cache");
+const enum_1 = require("../enum");
+function catchFn(view) {
+    return async (err) => {
+        if (err.code !== enum_1.BusinessCode.HasReferenced) // 节点被引用，不用刷新数据
+            await cache_1.refreshHtml(view);
+        else
+            __1.config.defaultApp?.emit('saved', err);
+        __1.config.defaultApp?.history.load();
+        throw err;
+    };
+}
+exports.catchFn = catchFn;
 /**
  * 前端页面元素
  * @example
@@ -69,6 +81,10 @@ class Element extends __1.Vertex {
          * Vue 中的 ref
          */
         this.name = undefined;
+        /*
+        * 描述信息
+        */
+        this.description = undefined;
         /**
          * 属性列表
          * 和原来的 attrsList 不同，注意区分
@@ -133,9 +149,6 @@ class Element extends __1.Vertex {
          */
         this.children = [];
         source && this.assign(source);
-        // 为了给生成的节点使用
-        // !this.id && this.assign({ id: uuidv4() });
-        // this.assign({ id: 'temp-' + uuidv4() });
     }
     assign(source) {
         ['attrList', 'eventList', 'directiveList', 'children'].forEach((key) => {
@@ -153,59 +166,42 @@ class Element extends __1.Vertex {
             return this;
         }
         __1.config.defaultApp?.emit('saving');
-        try {
-            if (actionOptions?.actionMode !== __1.ACTION_MODE.undoRedo) {
-                const body = this.toJSON();
-                body.parentId = this.parent && this.parent.id;
-                body._posIndex = this.parent && this.parent.children.indexOf(this);
-                __1.utils.logger.debug('添加元素', body);
-                const result = await page_1.elementService.create({
-                    headers: {
-                        appId: __1.config.defaultApp?.id,
-                        operationAction: 'Element.create',
-                        operationDesc: `添加组件"${this.getElementTitle()}"`,
-                    },
-                    body,
-                });
-                // Nuims createResource
-                // Element 对应资源增删在 undo/redo 情况下可能存在权限丢失的情况
-                // 暂时只增不减
-                // new Nuims({
-                //     domainName: this.view.page.service.app.name,
-                //     element: this,
-                // }).createResource();
-                this.deepPick(result, ['id', 'parentId', 'elementId']);
-                // attr,directive,event的id,exprssion需要合并
-                this.attrList.forEach((attr, index) => {
-                    attr.deepPick(result.attrList[index], ['id', 'expression']);
-                });
-                this.directiveList.forEach((directive, index) => {
-                    directive.deepPick(result.directiveList[index], ['id', 'expression']);
-                });
-                this.eventList.forEach((event, index) => {
-                    event.deepPick(result.eventList[index], ['id']);
-                });
-            }
-            this.view && this.view.emit('change');
-            if (actionOptions?.loadHistory !== false) {
-                await __1.config.defaultApp?.history.load(actionOptions?.actionMode !== __1.ACTION_MODE.undoRedo && {
+        if (actionOptions?.actionMode !== __1.ACTION_MODE.undoRedo) {
+            const body = this.toJSON();
+            body.parentId = this.parent && this.parent.id;
+            body._posIndex = this.parent && this.parent.children.indexOf(this);
+            __1.utils.logger.debug('添加元素', body);
+            const result = await page_1.elementService.create({
+                headers: {
+                    appId: __1.config.defaultApp?.id,
                     operationAction: 'Element.create',
-                    operationBeforeImage: null,
-                    operationAfterImage: JSON.parse(JSON.stringify(this)),
                     operationDesc: `添加组件"${this.getElementTitle()}"`,
-                });
-                __1.config.defaultApp?.emit('saved');
-            }
-            return this;
+                },
+                body,
+            }).catch(catchFn(this.view));
+            this.deepPick(result, ['id', 'parentId', 'elementId']);
+            // attr,directive,event的id,expression需要合并
+            this.attrList.forEach((attr, index) => {
+                attr.deepPick(result.attrList[index], ['id', 'expression']);
+            });
+            this.directiveList.forEach((directive, index) => {
+                directive.deepPick(result.directiveList[index], ['id', 'expression']);
+            });
+            this.eventList.forEach((event, index) => {
+                event.deepPick(result.eventList[index], ['id']);
+            });
         }
-        catch (err) {
-            if (this.view) {
-                await this.view.load();
-                this.view.emit('change');
-                __1.config.defaultApp?.emit('saved');
-            }
-            throw err;
+        this.view && this.view.emit('change');
+        if (actionOptions?.loadHistory !== false) {
+            await __1.config.defaultApp?.history.load(actionOptions?.actionMode !== __1.ACTION_MODE.undoRedo && {
+                operationAction: 'Element.create',
+                operationBeforeImage: null,
+                operationAfterImage: JSON.parse(JSON.stringify(this)),
+                operationDesc: `添加组件"${this.getElementTitle()}"`,
+            });
+            __1.config.defaultApp?.emit('saved');
         }
+        return this;
     }
     /**
      * 删除元素
@@ -214,6 +210,7 @@ class Element extends __1.Vertex {
         if (actionOptions?.actionMode === __1.ACTION_MODE.local) {
             const index = this.parent.children.indexOf(this);
             ~index && this.parent.children.splice(index, 1);
+            this.deepRemoveElementsName();
             this.view && this.view.emit('local-change');
             return this;
         }
@@ -222,33 +219,22 @@ class Element extends __1.Vertex {
             throw Error('该元素为根节点！');
         if (actionOptions?.actionMode !== __1.ACTION_MODE.undoRedo) {
             if (this.id) {
-                try {
-                    await page_1.elementService.delete({
-                        headers: {
-                            appId: __1.config.defaultApp?.id,
-                            operationAction: 'Element.delete',
-                            operationDesc: `删除组件"${this.getElementTitle()}"`,
-                        },
-                        query: {
-                            id: this.id,
-                        },
-                    });
-                }
-                catch (err) {
-                    await __1.config.defaultApp?.history.load();
-                    throw err;
-                }
-                // Nuims deleteResource
-                // Element 对应资源增删在 undo/redo 情况下可能存在权限丢失的情况
-                // 暂时只增不减
-                // new Nuims({
-                //     domainName: this.view.page.service.app.name,
-                //     element: this,
-                // }).deleteResources();
+                await page_1.elementService.delete({
+                    headers: {
+                        appId: __1.config.defaultApp?.id,
+                        operationAction: 'Element.delete',
+                        operationDesc: `删除组件"${this.getElementTitle()}"`,
+                    },
+                    query: {
+                        id: this.id,
+                    },
+                }).catch(catchFn(this.view));
             }
         }
         const index = this.parent.children.indexOf(this);
         ~index && this.parent.children.splice(index, 1);
+        // 递归删除组件名的缓存
+        this.deepRemoveElementsName();
         this.destroy();
         this.view && this.view.emit('change');
         if (actionOptions?.loadHistory !== false) {
@@ -267,37 +253,45 @@ class Element extends __1.Vertex {
     async update(source, actionOptions) {
         __1.config.defaultApp?.emit('saving');
         source && this.assign(source);
-        try {
-            if (actionOptions?.actionMode !== __1.ACTION_MODE.undoRedo) {
-                const body = this.toPlainJSON();
-                __1.utils.logger.debug('修改组件', body);
-                await page_1.elementService.update({
-                    headers: {
-                        appId: __1.config.defaultApp?.id,
-                        operationAction: actionOptions?.actionName || 'Element.update',
-                        operationDesc: actionOptions?.actionDesc || `修改组件"${this.getElementTitle()}"`,
-                    },
-                    body,
-                });
-            }
-            this.view && this.view.emit('change');
-            await __1.config.defaultApp?.history.load(actionOptions?.actionMode !== __1.ACTION_MODE.undoRedo && {
-                operationAction: 'Element.update',
-                operationBeforeImage: null,
-                operationAfterImage: null,
-                operationDesc: `修改组件"${this.getElementTitle()}"`,
-            });
-            __1.config.defaultApp?.emit('saved');
-            return this;
-        }
-        catch (err) {
-            if (this.view) {
-                await this.view.load();
-                this.view.emit('change');
-                __1.config.defaultApp?.emit('saved');
-            }
-            throw err;
+        if (actionOptions?.actionMode !== __1.ACTION_MODE.undoRedo) {
+            const body = this.toPlainJSON();
+            __1.utils.logger.debug('修改组件', body);
+            await page_1.elementService.update({
+                headers: {
+                    appId: __1.config.defaultApp?.id,
+                    operationAction: actionOptions?.actionName || 'Element.update',
+                    operationDesc: actionOptions?.actionDesc || `修改组件"${this.getElementTitle()}"`,
+                },
+                body,
+            }).catch(catchFn(this.view));
         }
+        this.view && this.view.emit('change');
+        await __1.config.defaultApp?.history.load(actionOptions?.actionMode !== __1.ACTION_MODE.undoRedo && {
+            operationAction: 'Element.update',
+            operationBeforeImage: null,
+            operationAfterImage: null,
+            operationDesc: `修改组件"${this.getElementTitle()}"`,
+        });
+        __1.config.defaultApp?.emit('saved');
+        return this;
+    }
+    /**
+     * 按当前 id 加载逻辑数据
+     */
+    async load() {
+        if (!this.id)
+            return;
+        const result = await page_1.elementService.load({
+            headers: {
+                appId: __1.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, actionOptions) {
         try {
@@ -326,12 +320,17 @@ class Element extends __1.Vertex {
                 await __1.config.defaultApp?.history.load();
             }
             __1.config.defaultApp?.emit('element.moved');
+            __1.config.defaultApp?.emit('saved');
         }
         catch (err) {
             if (this.view) {
                 await this.view.load();
                 this.view.emit('change');
             }
+            __1.config.defaultApp?.emit('saved', {
+                action: 'move',
+                err,
+            });
             throw err;
         }
     }
@@ -343,6 +342,8 @@ class Element extends __1.Vertex {
         const code = this.toVue();
         const index = this.parent.children.indexOf(this);
         const newNode = Element.fromHTML(code, this.parent, this.view);
+        // 复制的元素需重新命名
+        newNode.deepRenameElements();
         const mergeExpression = (originList, newList) => {
             newList.forEach((item) => {
                 const originItem = originList.find((originItem) => originItem.name === item.name);
@@ -392,6 +393,14 @@ class Element extends __1.Vertex {
                 }
             }
         };
+        const arrayComp = this.findElementsByTag('u-modal');
+        const existingNames = Object.values(lodash_1.mapValues(arrayComp, (o) => o.name));
+        // 处理弹窗组件的命名问题
+        if (newNode.tag === 'u-modal') {
+            Object.assign(newNode, {
+                name: __1.utils.unique('saveModal1', existingNames),
+            });
+        }
         traverseMergeNode(this, newNode);
         ~index && this.parent.children.splice(index + 1, 0, newNode);
         this.parent.children.forEach((item, index) => {
@@ -417,6 +426,8 @@ class Element extends __1.Vertex {
         }
         if (lodash_1.isPlainObject(child)) {
             child = Element.from(child, this, this.view);
+            child.initElementName();
+            child.deepRenameElements();
         }
         if (!this.children.includes(child)) {
             const index = child._posIndex === undefined ? this.children.length : child._posIndex;
@@ -447,11 +458,27 @@ class Element extends __1.Vertex {
         await this.update(undefined, {
             actionDesc: `设置组件"${this.getElementTitle()}"的名称为"${name}"`,
         });
-        // 同步权限
-        new __1.Nuims({
-            domainName: this.view.page.service.app.name,
-            element: this,
-        }).editResourceFromResourceValue(oldName ? `${this.view.tempPath}/${oldName}` : null);
+        if (!window.globalData.hasUserCenter) {
+            // 同步权限
+            new __1.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) {
+            this.view.page.service.emit('vertexIdToNameChange', this.id, this.name);
+        }
+    }
+    /**
+     * 更新描述信息
+     * @param description
+     */
+    async setDescription(description) {
+        this.assign({ description });
+        await this.update(undefined, {
+            actionDesc: `设置组件"${this.getElementTitle()}"的描述为"${description}"`,
+        });
         this.view && this.view.emit('change');
         if (this.view && this.view.page && this.view.page.service) {
             this.view.page.service.emit('vertexIdToNameChange', this.id, this.name);
@@ -494,9 +521,7 @@ class Element extends __1.Vertex {
     async setAttr(name, type, value) {
         let attr = this.getAttr(name);
         //
-        if (value === undefined) {
-        }
-        else {
+        if (value !== undefined) {
             if (typeof value !== 'string')
                 value = JSON.stringify(value);
             if (attr) {
@@ -506,7 +531,7 @@ class Element extends __1.Vertex {
                 });
                 await attr.update(undefined, {
                     actionDesc: `设置组件"${this.getElementTitle()}"属性"${attr.name}"的值为"${attr.value}"`,
-                });
+                }).catch(catchFn(this.view));
             }
             else {
                 attr = __1.Attr.from({
@@ -517,7 +542,7 @@ class Element extends __1.Vertex {
                 }, this);
                 await attr.create(undefined, {
                     actionDesc: `设置组件"${this.getElementTitle()}"属性"${attr.name}"的值为"${attr.value}"`,
-                });
+                }).catch(catchFn(this.view));
                 this.attrList.push(attr);
             }
         }
@@ -531,7 +556,7 @@ class Element extends __1.Vertex {
         let event = new __1.Event(data);
         await event.create(undefined, Object.assign({
             actionDesc: `添加组件"${this.getElementTitle()}"事件"${event.name}"`,
-        }, actionOptions));
+        }, actionOptions)).catch(catchFn(this.view));
         event = __1.Event.from(event, this);
         this.eventList.push(event);
         this.view && this.view.emit('change');
@@ -549,7 +574,7 @@ class Element extends __1.Vertex {
             event = this.eventList.find((item) => item.id === event.id);
         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);
         this.view && this.view.emit('change');
@@ -564,7 +589,7 @@ class Element extends __1.Vertex {
         const directive = new __1.Directive(data);
         await directive.create(undefined, Object.assign({
             actionDesc: `添加组件"${this.getElementTitle()}"指令"${directive.name}"`,
-        }, actionOptions));
+        }, actionOptions)).catch(catchFn(this.view));
         this.directiveList.push(__1.Directive.from(directive, this));
         this.view && this.view.emit('change');
     }
@@ -578,7 +603,7 @@ class Element extends __1.Vertex {
             directive = this.directiveList.find((item) => item.id === directive.id);
         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);
         this.view && this.view.emit('change');
@@ -652,8 +677,11 @@ class Element extends __1.Vertex {
                 if (attr.level === __1.LEVEL_ENUM.attr) {
                     const api = __1.config.allNodesAPI[el.tag];
                     const apiOfAttr = api && api.attrs && api.attrs.find((_attr) => _attr.name === attr.name);
-                    if (apiOfAttr && apiOfAttr['designer-value']) {
-                        const designerValue = apiOfAttr['designer-value'].replace(/"/g, '\'');
+                    if (apiOfAttr && apiOfAttr['designer-value'] !== undefined) {
+                        let designerValue = apiOfAttr['designer-value'];
+                        if (typeof designerValue === 'string') {
+                            designerValue = designerValue.replace(/"/g, '\'');
+                        }
                         try {
                             json5.parse(designerValue);
                             return `:${attr.name}="${designerValue}"`;
@@ -739,6 +767,63 @@ class Element extends __1.Vertex {
             }
         }
     }
+    findElementsByTag(tag) {
+        let existingNames = [];
+        existingNames = this.findElementsByTagCurrent(tag, existingNames);
+        this.findElementsByTagInChildren(this.view.$html.children, tag, existingNames);
+        return existingNames;
+    }
+    findElementsByTagCurrent(tag, existingNames) {
+        if (this.tag === tag) {
+            existingNames.push(this);
+        }
+        return existingNames;
+    }
+    findElementsByTagInChildren(children, tag, existingNames) {
+        for (const child of children) {
+            const result = child.findElementByTag(tag);
+            if (child.children) {
+                this.findElementsByTagInChildren(child.children, tag, existingNames);
+            }
+            if (result) {
+                existingNames.push(result);
+            }
+        }
+    }
+    // 初始化组件名
+    initElementName() {
+        if (Element.ignoreTag.includes(this.tag)) {
+            return;
+        }
+        const name = this.genElementName();
+        this.assign({ name });
+        this.view.addElementName(name);
+    }
+    // 生成新的组件名
+    genElementName() {
+        const compNameSet = this.view.elementNameSet;
+        const tagName = this.tag.replace(Element.TAG_NAME_REG, '').replace(/-/g, '_');
+        const componentName = __1.utils.unique(tagName + '1', compNameSet);
+        return componentName;
+    }
+    // 递归生成组件名
+    deepRenameElements() {
+        return this.traverseChildren((ele) => {
+            ele.initElementName();
+        });
+    }
+    // 递归删除组件名的缓存
+    deepRemoveElementsName() {
+        return this.traverseChildren((ele) => {
+            this.view.removeElementName(ele.name);
+        });
+    }
+    // 递归遍历组件
+    traverseChildren(cb) {
+        __1.utils.traverse((current) => {
+            cb(current.node);
+        }, { node: this });
+    }
     /**
      * 从 Vue 的 ASTNode 转换成 ASL 元素
      * @param astNode Vue 的 ASTNode
@@ -780,8 +865,6 @@ class Element extends __1.Vertex {
                     astNode.tag = 'u-router-view';
                 }
             }
-            // if (astNode.tag === 'template')
-            //     astNode.tag = 'div';
             element = new Element({
                 tag: astNode.tag,
                 name: astNode.attrsMap.ref,
@@ -823,7 +906,6 @@ class Element extends __1.Vertex {
                     }
                 }
                 element.attrList.push(attr);
-                // element.attrMap[attr.name] = attr;
             });
             // compiler 处理:value.sync 时会加上update:value事件，需要过滤
             astNode.events && Object.keys(astNode.events).filter((name) => !name.startsWith('update:')).forEach((name) => {
@@ -834,10 +916,6 @@ class Element extends __1.Vertex {
                     value,
                     logicId: value[0] === '$' ? undefined : value,
                 }, element));
-                // element.eventMap[name] = new Event({
-                //     name,
-                //     value: oldEvent.value,
-                // });
             });
             astNode.directives && astNode.directives.forEach((directive) => {
                 if (directive.name === 'model') {
@@ -864,7 +942,6 @@ class Element extends __1.Vertex {
                         arg: directive.arg,
                         modifiers: directive.modifiers,
                     }, element));
-                    // element.directiveMap[directive.name] = );
                 }
             });
             if (astNode.if) {
@@ -1205,6 +1282,10 @@ class Element extends __1.Vertex {
         const element = this.parse(html, context);
         __1.utils.traverse((current) => {
             current.node.assign({ view, parent: current.parent });
+            // 生成唯一组件名 依赖element.view
+            if (!current.node.name) {
+                current.node.initElementName();
+            }
         }, { node: element, parent });
         return element;
     }
@@ -1225,6 +1306,14 @@ class Element extends __1.Vertex {
         return element;
     }
 }
+/**
+ * 标签名前缀
+ */
+Element.TAG_NAME_REG = /^([lieu]|van)[-_]/;
+/**
+ * 忽略命名的标签
+ */
+Element.ignoreTag = ['div', 'span'];
 __decorate([
     decorators_1.immutable()
 ], Element.prototype, "level", void 0);
@@ -1240,6 +1329,9 @@ __decorate([
 __decorate([
     decorators_1.immutable()
 ], Element.prototype, "name", void 0);
+__decorate([
+    decorators_1.immutable()
+], Element.prototype, "description", void 0);
 __decorate([
     decorators_1.immutable()
 ], Element.prototype, "attrList", void 0);
@@ -1317,6 +1409,12 @@ __decorate([
 __decorate([
     decorators_1.action('删除组件指令')
 ], Element.prototype, "deleteDirective", null);
+__decorate([
+    decorators_1.immutable()
+], Element, "TAG_NAME_REG", void 0);
+__decorate([
+    decorators_1.immutable()
+], Element, "ignoreTag", void 0);
 exports.Element = Element;
 exports.default = Element;
 //# sourceMappingURL=Element.js.map