@lcap/nasl 3.5.0-beta.4 → 3.6.0-alpha.1

package/out/concepts/App__.js

@@ -78,9 +78,9 @@ let App = App_1 = class App extends BaseNode_1.default {
          */
         this.interfaces = [];
         /**
-         * 端类型列表
+         * 前端列表
          */
-        this.frontendTypes = [];
+        this.frontends = [];
         /**
          * 后端
          */
@@ -165,6 +165,10 @@ let App = App_1 = class App extends BaseNode_1.default {
          * 全局设置
          */
         this.preferenceMap = {};
+        /**
+         * 组合节点缓存
+         */
+        this.composeCache = {};
         this.packageInfos = [];
         /**
          * 当前正在发布的环境，临时状态
@@ -621,66 +625,64 @@ let App = App_1 = class App extends BaseNode_1.default {
     getAbstractInterfaceUniqueName(name = 'Interface1') {
         return utils.unique(name, this.getAbstractInterfaceExistingNames(), undefined, true);
     }
-    getFrontendTypeExistingNames(excludedList = []) {
+    getFrontendExistingNames(excludedList = []) {
         const excludedSet = new Set(excludedList);
-        return (this.frontendTypes || [])
-            .filter((item) => !excludedSet.has(item))
-            .map((item) => item?.name);
+        return (this.frontends || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
     }
-    getFrontendTypeUniqueName(name = 'frontendType1') {
-        return utils.unique(name, this.getFrontendTypeExistingNames(), undefined, true);
+    getFrontendUniqueName(name = 'frontend1') {
+        return utils.unique(name, this.getFrontendExistingNames(), undefined, true);
     }
-    _insertFrontendTypeAt(options, index) {
-        const frontendTypeOptions = {};
-        const relationOptions = { parentNode: this, parentKey: 'frontendTypes' };
-        const FrontendType = (0, decorators_1.getConceptConstructor)('FrontendType');
-        let frontendType;
+    _insertFrontendAt(options, index) {
+        const frontendOptions = {};
+        const relationOptions = { parentNode: this, parentKey: 'frontends' };
+        const Frontend = (0, decorators_1.getConceptConstructor)('Frontend');
+        let frontend;
         if (!options) {
-            frontendType = FrontendType.from({
-                ...frontendTypeOptions,
-                name: this.getFrontendTypeUniqueName(),
-            }, this, 'frontendTypes');
+            frontend = Frontend.from({
+                ...frontendOptions,
+                name: this.getFrontendUniqueName(),
+            }, this, 'frontends');
         }
         else if (typeof options === 'string') {
-            frontendType = FrontendType.from({
-                ...frontendTypeOptions,
+            frontend = Frontend.from({
+                ...frontendOptions,
                 name: options,
-            }, this, 'frontendTypes');
+            }, this, 'frontends');
         }
-        else if (asserts.isFrontendType(options)) {
+        else if (asserts.isFrontend(options)) {
             options.ensureDelete(); // 同一实例不支持多处存在
-            frontendType = options;
-            Object.assign(frontendType, relationOptions);
+            frontend = options;
+            Object.assign(frontend, relationOptions);
         }
         else {
-            frontendType = FrontendType.from({
-                ...frontendTypeOptions,
+            frontend = Frontend.from({
+                ...frontendOptions,
                 ...options,
-            }, this, 'frontendTypes');
+            }, this, 'frontends');
         }
-        this.frontendTypes.splice(index, 0, frontendType);
-        return frontendType;
+        this.frontends.splice(index, 0, frontend);
+        return frontend;
     }
-    insertFrontendTypeAt(options, index) {
-        const node = this._insertFrontendTypeAt(options, index);
+    insertFrontendAt(options, index) {
+        const node = this._insertFrontendAt(options, index);
         node.create({
             index,
             parentNode: this,
-            parentKey: 'frontendTypes',
+            parentKey: 'frontends',
         });
         return node;
     }
-    _addFrontendType(options) {
-        const index = this.frontendTypes.length;
-        return this._insertFrontendTypeAt(options, index);
+    _addFrontend(options) {
+        const index = this.frontends.length;
+        return this._insertFrontendAt(options, index);
     }
-    addFrontendType(options) {
-        const node = this._addFrontendType(options);
-        const index = this.frontendTypes.indexOf(node);
+    addFrontend(options) {
+        const node = this._addFrontend(options);
+        const index = this.frontends.indexOf(node);
         node.create({
             index,
             parentNode: this,
-            parentKey: 'frontendTypes',
+            parentKey: 'frontends',
         });
         return node;
     }
@@ -1454,34 +1456,34 @@ let App = App_1 = class App extends BaseNode_1.default {
         }
         return params;
     }
-    removeFrontendType(options) {
-        let frontendType;
+    removeFrontend(options) {
+        let frontend;
         if (typeof options === 'string') {
-            frontendType = this.frontendTypes.find((item) => item.name === options);
-            if (!frontendType) {
-                throw new Error('找不到端类型 ' + options);
+            frontend = this.frontends.find((item) => item.name === options);
+            if (!frontend) {
+                throw new Error('找不到前端 ' + options);
             }
         }
         else {
-            frontendType = options;
+            frontend = options;
         }
-        return frontendType.delete();
+        return frontend.delete();
     }
-    __removeFrontendType(frontendType) {
-        const parentKey = frontendType.parentKey;
+    __removeFrontend(frontend) {
+        const parentKey = frontend.parentKey;
         const params = {
             parentNode: this,
             parentKey,
             index: -1,
             object: null,
-            oldObject: frontendType,
+            oldObject: frontend,
         };
         if (parentKey) {
             params.parentKey = parentKey;
             // @ts-ignore
             const t = this.__v_raw || this;
             // @ts-ignore
-            const n = frontendType.__v_raw || frontendType;
+            const n = frontend.__v_raw || frontend;
             if (Array.isArray(t[parentKey])) {
                 // @ts-ignore
                 const index = t[parentKey].findIndex((el) => (el.__v_raw || el) === n);
@@ -1939,6 +1941,100 @@ let App = App_1 = class App extends BaseNode_1.default {
     findLogicByName(name) {
         return this.logics.find((logic) => logic.name === name);
     }
+    /**
+     * 获取组合节点
+     */
+    getComposeNodes(path) {
+        let compose = this.composeCache;
+        path.forEach((key) => {
+            compose = compose?.[key];
+        });
+        return compose?.nodes || [];
+    }
+    /**
+     * 往组合内添加节点
+     */
+    addComposeNodes(path, node) {
+        let compose = this.composeCache;
+        path.forEach((key, index) => {
+            if (index === path.length - 1) {
+                if (compose?.[key]?.nodes) {
+                    if (Array.isArray(node)) {
+                        compose[key].nodes.push(...node);
+                    }
+                    else {
+                        compose[key].nodes.push(node);
+                    }
+                }
+                else {
+                    if (!compose?.[key]) {
+                        compose[key] = {};
+                    }
+                    compose[key].nodes = Array.isArray(node) ? node : [node];
+                }
+            }
+            else {
+                if (!compose?.[key]) {
+                    compose[key] = {};
+                }
+                compose = compose[key];
+            }
+        });
+    }
+    /**
+     * 删除分组, 包括子集
+     */
+    deleteCompose(path) {
+        if (!Array.isArray(path))
+            return;
+        let compose = this.composeCache;
+        const delNodes = (_compose) => {
+            if (_compose?.nodes) {
+                for (let key in _compose) {
+                    if (key !== 'nodes') {
+                        delNodes(_compose[key]);
+                    }
+                }
+                _compose.nodes.forEach((node) => {
+                    node.delete();
+                });
+                _compose.nodes = [];
+            }
+        };
+        this.emit('collect:start', {
+            actionMsg: '删除同一分组节点',
+        });
+        path.forEach((key, index) => {
+            if (index === path.length - 1) {
+                delNodes(compose?.[key]);
+            }
+            else {
+                compose = compose[key];
+            }
+        });
+        this.emit('collect:end');
+    }
+    /**
+     * 释放分组内所有节点
+     */
+    releaseComposeNode(path) {
+        if (!Array.isArray(path))
+            return;
+        let compose = this.composeCache;
+        path.forEach((key, index) => {
+            if (index === path.length - 1) {
+                const nodes = compose?.[key]?.nodes || [];
+                nodes.forEach((node) => {
+                    node.update({
+                        composedBy: [],
+                    });
+                });
+            }
+            else {
+                compose = compose[key];
+            }
+        });
+    }
     /**
      * 获取命名空间
      */
@@ -2008,20 +2104,19 @@ let App = App_1 = class App extends BaseNode_1.default {
         this.envList = ['dev', 'online'];
     }
     loadPackageInfo(scope) {
-        const dependencyMap = window.globalData.ideVersionDetail.dependencies;
+        const materialConfig = window.globalData.materialConfig || {};
+        const { framework, ui } = materialConfig;
         const packageInfo = {
             template: { name: '', version: '', scope },
             ui: { name: '', version: '', scope },
             scope,
         };
-        packageInfo.template.name = scope === 'h5' ? '@lcap/mobile-template' : 'lcap-pc-template';
-        packageInfo.template.version =
-            scope === 'h5' ? dependencyMap.FrontendArchH5.version : dependencyMap.FrontendArchPC.version;
-        packageInfo.ui.name = scope === 'h5' ? '@lcap/mobile-ui' : 'cloud-ui.vusion';
-        packageInfo.ui.version =
-            scope === 'h5'
-                ? dependencyMap.FrontendComponentLibraryH5.version
-                : dependencyMap.FrontendComponentLibraryPC.version;
+        packageInfo.template.name = scope === 'h5' ? framework.h5 : framework.pc;
+        packageInfo.template.version = framework.version;
+        packageInfo.ui.name = scope === 'h5' ? ui.h5.name : ui.pc.name;
+        packageInfo.ui.version = scope === 'h5'
+            ? ui.h5.version
+            : ui.pc.version;
         return packageInfo;
     }
     loadPackageInfos() {
@@ -2044,20 +2139,12 @@ let App = App_1 = class App extends BaseNode_1.default {
                 js: [
                     `${prefix}/packages/vue@2/dist/vue.min.js`,
                     // `${prefix}/packages/vue-router@3/dist/vue-router.min.js`,
-                    scope === 'h5'
-                        ? `${prefix}/packages/@lcap/mobile-ui@${packageInfo.ui.version}/dist-theme/index.js`
-                        : `${prefix}/packages/cloud-ui.vusion@${packageInfo.ui.version}/dist-theme/index.js`,
-                    scope === 'h5'
-                        ? `${prefix}/packages/@lcap/mobile-template@${packageInfo.template.version}/cloudAdminDesigner.umd.min.js`
-                        : `${prefix}/packages/lcap-pc-template@${packageInfo.template.version}/cloudAdminDesigner.umd.min.js`,
+                    `${prefix}/packages/${packageInfo.ui.name}@${packageInfo.ui.version}/dist-theme/index.js`,
+                    `${prefix}/packages/${packageInfo.template.name}@${packageInfo.template.version}/cloudAdminDesigner.umd.min.js`,
                 ],
                 css: [
-                    scope === 'h5'
-                        ? `${prefix}/packages/@lcap/mobile-ui@${packageInfo.ui.version}/dist-theme/index.css`
-                        : `${prefix}/packages/cloud-ui.vusion@${packageInfo.ui.version}/dist-theme/index.css`,
-                    scope === 'h5'
-                        ? `${prefix}/packages/@lcap/mobile-template@${packageInfo.template.version}/cloudAdminDesigner.css`
-                        : `${prefix}/packages/lcap-pc-template@${packageInfo.template.version}/cloudAdminDesigner.css`,
+                    `${prefix}/packages/${packageInfo.ui.name}@${packageInfo.ui.version}/dist-theme/index.css`,
+                    `${prefix}/packages/${packageInfo.template.name}@${packageInfo.template.version}/cloudAdminDesigner.css`,
                 ],
             },
             custom: {
@@ -2066,10 +2153,10 @@ let App = App_1 = class App extends BaseNode_1.default {
                 names: [],
             },
         };
-        const frontendTypes = this.frontendTypes.filter((frontendType) => frontendType.kind === scope);
+        const frontends = this.frontends.filter((frontend) => frontend.type === scope);
         const existingSet = new Set();
-        frontendTypes.forEach((frontendType) => {
-            frontendType.componentDependencies.forEach((dep) => {
+        frontends.forEach((frontend) => {
+            frontend.componentDependencies.forEach((dep) => {
                 const { name, version } = dep;
                 const jsName = `${prefix}/packages/${name}@${version}/dist-theme/index.js`;
                 if (!existingSet.has(jsName)) {
@@ -2169,7 +2256,7 @@ let App = App_1 = class App extends BaseNode_1.default {
             structureCount: this.structures.length,
             enumCount: this.enums.length,
             logicCount: this.logics.length,
-            viewCount: sum(this.frontendTypes.map((frontendType) => sum(frontendType.frontends.map((frontend) => countView(frontend.views))))),
+            viewCount: sum(this.frontends.map((frontend) => countView(frontend.views))),
             processCount: this.processes.length,
         };
     }
@@ -2339,18 +2426,33 @@ let App = App_1 = class App extends BaseNode_1.default {
         });
         return errorList;
     }
+    addFrontendForType(options) {
+        let insertIndex = -1;
+        this.frontends.forEach((frontend, index) => {
+            if (frontend.type === options.type) {
+                insertIndex = index;
+            }
+        });
+        if (options.type === 'h5' && insertIndex === -1) {
+            insertIndex = this.frontends.length;
+        }
+        const node = this._insertFrontendAt(options, insertIndex + 1);
+        const index = this.frontends.indexOf(node);
+        node.create({
+            index,
+            parentNode: this,
+            parentKey: 'frontends',
+        });
+        return node;
+    }
     getFrontendExistingTitles(excludedList = []) {
         const excludedSet = new Set(excludedList);
-        return (this.frontendTypes || [])
-            .map((frontendType) => frontendType.frontends?.filter((item) => !excludedSet.has(item)).map((item) => item.title))
-            .flat(2);
+        return (this.frontends || []).filter((item) => !excludedSet.has(item)).map((item) => item.title);
     }
     getExtensionsCallbackLogics() {
         let resultLogics = [];
-        this.frontendTypes.forEach((frontendType) => {
-            frontendType?.frontends?.forEach((frontend) => {
-                resultLogics = [...resultLogics, ...frontend.getExtensionsCallbackLogics()];
-            });
+        this.frontends.forEach((frontend) => {
+            resultLogics = [...resultLogics, ...frontend.getExtensionsCallbackLogics()];
         });
         return Array.from(new Set(resultLogics));
     }
@@ -2361,17 +2463,18 @@ let App = App_1 = class App extends BaseNode_1.default {
         return `${utils.unique(name, this.getLogicExistingNames(), undefined, true)}Service`;
     }
     genAllCustomComponents() {
+        const { frontends } = this;
         const compMap = {
             pc: [],
             h5: [],
         };
         const existingSet = new Set();
-        this.frontendTypes.forEach((frontendType) => {
-            if (frontendType.componentDependencies) {
-                frontendType.componentDependencies.forEach((dep) => {
+        frontends.forEach((frontend) => {
+            if (frontend.componentDependencies) {
+                frontend.componentDependencies.forEach((dep) => {
                     const { name } = dep;
                     if (!existingSet.has(name)) {
-                        compMap[frontendType.kind].push(dep);
+                        compMap[frontend.type].push(dep);
                     }
                 });
             }
@@ -2667,11 +2770,11 @@ __decorate([
 ], App.prototype, "interfaces", void 0);
 __decorate([
     (0, decorators_1.property)({
-        objectRef: 'FrontendType',
+        objectRef: 'Frontend',
         isArray: true,
         defaultValue: [],
     })
-], App.prototype, "frontendTypes", void 0);
+], App.prototype, "frontends", void 0);
 __decorate([
     (0, decorators_1.property)({
         objectRef: 'Backend',