@lcap/nasl 0.3.10-beta.oom4 → 0.3.12-beta

package/src/types/page/View.ts

@@ -59,6 +59,12 @@ export class View extends Block {
      */
     @immutable()
     public readonly title: string = undefined;
+
+    /**
+     * 标题
+     */
+    @immutable()
+    public readonly description: string = undefined;
     /**
      * 面包屑
      */
@@ -128,6 +134,12 @@ export class View extends Block {
      */
     @immutable()
     public readonly moreChildrenFields: Array<string> = ['$def.params', '$def.variables', '$def.logics'];
+    /**
+     * 当前View中所有组件名的缓存
+     */
+    @immutable()
+    public readonly elementNameSet: Set<string> = new Set();
+
     /**
      * @param source 需要合并的部分参数
      */
@@ -201,35 +213,39 @@ export class View extends Block {
         })().finally(() => this.contentPromise = undefined);
     }
     loadAll(enableCache = true) {
+        const isGONGHANG = utils.getGlobalEnv() === 'gonghang';
+        if (isGONGHANG) {
+            enableCache = false;
+        }
         // 如果有正在进行的 Promise，则直接返回它
         if (this.contentPromise)
             return this.contentPromise;
 
         return this.contentPromise = (async () => {
-                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;
+            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;
         })().finally(() => this.contentPromise = undefined);
     }
     isContentLoaded() {
@@ -417,16 +433,16 @@ export class View extends Block {
         if (!this.parent)
             throw Error('该子页面为根节点！');
 
-            await viewService.delete({
-                headers: {
-                    appId: config.defaultApp?.id,
-                    operationAction: actionOptions?.actionName || 'View.delete',
-                    operationDesc: actionOptions?.actionDesc || `删除子页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
-                },
-                path: {
-                    id: this.id,
-                },
-            }).catch(catchFn());
+        await viewService.delete({
+            headers: {
+                appId: config.defaultApp?.id,
+                operationAction: actionOptions?.actionName || 'View.delete',
+                operationDesc: actionOptions?.actionDesc || `删除子页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
+            },
+            path: {
+                id: this.id,
+            },
+        }).catch(catchFn());
 
         const index = this.parent.children.indexOf(this);
         ~index && this.parent.children.splice(index, 1);
@@ -474,15 +490,13 @@ export class View extends Block {
     async setName(name: string) {
         const oldName = this.name;
         const oldTempPath = this.tempPath;
-        this.assign({ name });
-        this.assign({
-            tempPath: this.parent ? `${this.parent.tempPath}/${name}` : `/${name}`,
-        });
+        const newTempPath = this.parent ? `${this.parent.tempPath}/${name}` : `/${name}`;
+        this.assign({ name, tempPath: newTempPath });
         await this.update(undefined, {
             actionDesc: `设置页面"${oldName}"的名称为"${name}"`,
         });
         if (this.page.rootView === this) {
-            this.page.assign({ name });
+            this.page.assign({ name, tempPath: newTempPath });
             await this.page.update();
         }
         // 同步权限
@@ -490,6 +504,12 @@ export class View extends Block {
             domainName: this.page.service.app.name,
             view: this,
         }).editResourceFromResourceValue(oldTempPath);
+        // 批量调整子页面的 tempPath 和权限
+        if (this.children.length) {
+            this.children.forEach(async (child: View) => {
+                await this.updateTempPath(child);
+            });
+        }
         this.page.service.emit('pageTreeChange');
         this.emit('change');
     }
@@ -528,6 +548,27 @@ export class View extends Block {
         this.page.service.emit('pageTreeChange');
         this.emit('change');
     }
+
+    /**
+     * 描述信息
+     * @param description 描述信息
+     */
+    @action('设置子页面面包屑')
+    async setDescription(description: string) {
+        const oldDescription = this.description;
+        this.assign({ description });
+        await this.update(undefined, {
+            actionDesc: `设置页面"${oldDescription}"的描述为"${description}"`,
+        });
+
+        if (this.page.rootView === this) {
+            this.page.assign({ description });
+            await this.page.update();
+        }
+
+        this.page.service.emit('pageTreeChange');
+        this.emit('change');
+    }
     /**
      * 设置该子页面为默认跳转页
      */
@@ -820,9 +861,23 @@ export class View extends Block {
                 body.$html._posIndex = +posIndex;
             }
 
+            // 生成组件名字
             traverse((current) => {
-                if (current.node.level === 'element' && current.node.name)
-                    setNewNameIfNotUnique(current.node, 'name', 'elements');
+                const ele = current.node;
+                if (ele.level !== 'element') {
+                    return;
+                }
+                // 自带ref名的组件
+                if (ele.name) {
+                    setNewNameIfNotUnique(ele, 'name', 'elements');
+                } else {
+                    if (Element.ignoreTag.includes(ele.tag)) {
+                        return;
+                    }
+                    const tagName = ele.tag.replace(Element.TAG_NAME_PREFIX_REG, '').replace(/-/g, '_');
+                    ele.name = utils.unique(tagName + '1', this.elementNameSet);
+                }
+                this.addElementName(ele.name);
             }, { node: body.$html });
         }
 
@@ -907,6 +962,40 @@ export class View extends Block {
         // config.defaultApp?.emit('saved');
     }
 
+    // 遍历页面缓存所有组件名
+    traverseAllElementName(): void {
+        this.elementNameSet.clear();
+        utils.traverse(({ node }) => {
+            node && this.elementNameSet.add(node.name);
+        }, { node: this.$html });
+    }
+
+    // 组件名是否有效
+    isValidElementName(name: string): boolean {
+        if (name) {
+            return !this.elementNameSet.has(name);
+        }
+        return false;
+    }
+
+    // 保存组件名至缓存
+    addElementName(nameOrElement: string | Element) {
+        let name: string = nameOrElement as string;
+        if (nameOrElement instanceof Element) {
+            name = nameOrElement.name;
+        }
+        return this.elementNameSet.add(name);
+    }
+
+    // 在缓存中移除组件名
+    removeElementName(nameOrElement: string | Element): void {
+        let name: string = nameOrElement as string;
+        if (nameOrElement instanceof Element) {
+            name = nameOrElement.name;
+        }
+        this.elementNameSet.delete(name);
+    }
+
     _removeDef($def: View['$def']) {
         const removedParams = this.$def.params.filter((param) => $def.params?.find((item) => param.id === item.id));
         this.$def.params = this.$def.params.filter((param) => !$def.params?.find((item) => param.id === item.id));
@@ -1038,6 +1127,26 @@ export class View extends Block {
                 this.$def.logics.push(Logic.from(logic, this));
         });
     }
+
+    // 批量调整子页面的 tempPath 和权限
+    async updateTempPath(view: View) {
+        const oldTempPath = view.tempPath;
+        view.assign({
+            tempPath: view.parent ? `${view.parent.tempPath}/${view.name}` : `/${view.name}`,
+        });
+        await view.update();
+        // 同步权限
+        new Nuims({
+            domainName: view.page.service.app.name,
+            view,
+        }).editResourceFromResourceValue(oldTempPath);
+        if (view.children.length) {
+            view.children.forEach(async (childView: View) => {
+                await view.updateTempPath(childView);
+            });
+        }
+    }
+
     /**
      * 从后端 JSON 生成规范的 View 对象
      * @param currentView 方便构建子对象时关联，主要在 load 中使用

package/src/types/page/ViewVariable.ts

@@ -1,8 +1,7 @@
 import { immutable, excludedInJSON, action } from '../decorators';
-import { config, history, utils, LEVEL_ENUM, Vertex, Logic, Variable, View, Schema, ActionOptions } from '..';
-import { paramService } from '../../service/logic';
+import { config, utils, Logic, Variable, View, Schema, ActionOptions } from '..';
 import { viewService } from '../../service/page';
-import { convert2RefType, convert2SchemaType } from '../data/dataTypeUtils';
+import { convert2RefType } from '../data/dataTypeUtils';
 import { getBasicTypeDefaultValue } from '../data/basicTypes';
 import { schemaService } from '../../service/common';
 import { catchFn } from './ViewParam';
@@ -43,7 +42,7 @@ export class ViewVariable extends Variable {
 
         const body = this.toJSON('', ['ideVersion', 'editable']);
         body.viewId = this.view.id;
-        // convert2SchemaType(body.schema);
+
         utils.logger.debug('添加页面局部变量', body);
         const result: ViewVariable = await viewService.createViewVariable({
             headers: {
@@ -53,7 +52,6 @@ export class ViewVariable extends Variable {
             },
             body,
         }).catch(catchFn(this.view));
-        // convert2RefType(result.schema);
         this.deepPick(result, ['id']);
         this.assign({ code: this.genCode() });
 
@@ -74,16 +72,16 @@ export class ViewVariable extends Variable {
         config.defaultApp?.emit('saving');
 
         if (this.id) {
-                await viewService.deleteViewVariable({
-                    headers: {
-                        appId: config.defaultApp?.id,
-                        operationAction: actionOptions?.actionName || 'ViewVariable.delete',
-                        operationDesc: actionOptions?.actionDesc || `删除页面"${this.view.name}"局部变量"${this.name}"`,
-                    },
-                    query: {
-                        id: this.id,
-                    },
-                }).catch(catchFn(this.view));
+            await viewService.deleteViewVariable({
+                headers: {
+                    appId: config.defaultApp?.id,
+                    operationAction: actionOptions?.actionName || 'ViewVariable.delete',
+                    operationDesc: actionOptions?.actionDesc || `删除页面"${this.view.name}"局部变量"${this.name}"`,
+                },
+                query: {
+                    id: this.id,
+                },
+            }).catch(catchFn(this.view));
         }
 
         const { variables } = this.view.$def;
@@ -109,7 +107,6 @@ export class ViewVariable extends Variable {
         delete body.ideVersion;
         delete body.editable;
         body.viewId = this.view.id;
-        // convert2SchemaType(body.schema);
         utils.logger.debug('修改页面局部变量', body);
         const result = await viewService.updateViewVariable({
             headers: {
@@ -119,8 +116,6 @@ export class ViewVariable extends Variable {
             },
             body,
         }).catch(catchFn(this.view));
-        // convert2RefType(result.schema);
-        // this.plainAssign(result);
 
         await config.defaultApp?.history.load();
         config.defaultApp?.emit('saved');
@@ -186,7 +181,6 @@ export class ViewVariable extends Variable {
             typeInstantiation: undefined,
         });
         Object.assign(this.schema, schema);
-        // if (this.defaultValue)
         this.assign({ defaultValue: getBasicTypeDefaultValue() });
         try {
             await this.update(undefined, {