@lcap/nasl 1.0.0-alpha.13 → 1.0.0-alpha.16

package/src/concepts/App__.ts

@@ -85,6 +85,18 @@ export class App extends BaseNode {
     @property()
     scope: 'pc' | 'h5' = undefined;
 
+    /**
+     * 制品应用标题
+     */
+    @property()
+    documentTitle: string = undefined;
+
+    /**
+     * 制品应用图标
+     */
+    @property()
+    documentIcon: string = undefined;
+
     /**
      * 是否有用户中心
      */
@@ -175,6 +187,8 @@ export class App extends BaseNode {
     @property('Module')
     componentDependencies: Array<Module> = [];
 
+    
+
     /**
      * @param source 需要合并的部分参数
      */
@@ -199,8 +213,31 @@ export class App extends BaseNode {
         }
         return params;
     }
+    /**
+     * 设置制品应用标题
+     */
+    setDocumentTitle(documentTitle: string) {
+        const object = {
+            documentTitle,
+        };
+        this.update({
+            ...object,
+        });
+    }
 
-    getEntityExistingNames(excludedList: Array<Entity> = []) {
+    /**
+     * 设置制品应用图标
+     */
+    setDocumentIcon(documentIcon: string) {
+        const object = {
+            documentIcon,
+        };
+        this.update({
+            ...object,
+        });
+    }
+
+        getEntityExistingNames(excludedList: Array<Entity> = []) {
         const excludedSet = new Set(excludedList);
         return (this.entities || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -244,7 +281,7 @@ export class App extends BaseNode {
                 name: options,
             }, this, 'entities');
         } else if (options instanceof Entity) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             entity = options;
             Object.assign(entity, relationOptions);
         } else {
@@ -341,6 +378,7 @@ export class App extends BaseNode {
         return node;
     }
 
+
     getStructureExistingNames(excludedList: Array<Structure> = []) {
         const excludedSet = new Set(excludedList);
         return (this.structures || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -385,7 +423,7 @@ export class App extends BaseNode {
                 name: options,
             }, this, 'structures');
         } else if (options instanceof Structure) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             structure = options;
             Object.assign(structure, relationOptions);
         } else {
@@ -482,6 +520,7 @@ export class App extends BaseNode {
         return node;
     }
 
+
     getEnumExistingNames(excludedList: Array<Enum> = []) {
         const excludedSet = new Set(excludedList);
         return (this.enums || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -526,7 +565,7 @@ export class App extends BaseNode {
                 name: options,
             }, this, 'enums');
         } else if (options instanceof Enum) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             enumeration = options;
             Object.assign(enumeration, relationOptions);
         } else {
@@ -623,6 +662,7 @@ export class App extends BaseNode {
         return node;
     }
 
+
     getLogicExistingNames(excludedList: Array<Logic> = []) {
         const excludedSet = new Set(excludedList);
         return (this.logics || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -667,7 +707,7 @@ export class App extends BaseNode {
                 name: options,
             }, this, 'logics');
         } else if (options instanceof Logic) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             logic = options;
             Object.assign(logic, relationOptions);
         } else {
@@ -764,6 +804,7 @@ export class App extends BaseNode {
         return node;
     }
 
+
     getInterfaceExistingNames(excludedList: Array<Interface> = []) {
         const excludedSet = new Set(excludedList);
         return (this.interfaces || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -808,7 +849,7 @@ export class App extends BaseNode {
                 name: options,
             }, this, 'interfaces');
         } else if (options instanceof Interface) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             itface = options;
             Object.assign(itface, relationOptions);
         } else {
@@ -905,6 +946,7 @@ export class App extends BaseNode {
         return node;
     }
 
+
     getViewExistingNames(excludedList: Array<View> = []) {
         const excludedSet = new Set(excludedList);
         return (this.views || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -949,7 +991,7 @@ export class App extends BaseNode {
                 name: options,
             }, this, 'views');
         } else if (options instanceof View) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             view = options;
             Object.assign(view, relationOptions);
         } else {
@@ -1046,6 +1088,7 @@ export class App extends BaseNode {
         return node;
     }
 
+
     getProcessExistingNames(excludedList: Array<Process> = []) {
         const excludedSet = new Set(excludedList);
         return (this.processes || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1090,7 +1133,7 @@ export class App extends BaseNode {
                 name: options,
             }, this, 'processes');
         } else if (options instanceof Process) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             process = options;
             Object.assign(process, relationOptions);
         } else {
@@ -1187,6 +1230,7 @@ export class App extends BaseNode {
         return node;
     }
 
+
     getRoleExistingNames(excludedList: Array<Role> = []) {
         const excludedSet = new Set(excludedList);
         return (this.roles || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1231,7 +1275,7 @@ export class App extends BaseNode {
                 name: options,
             }, this, 'roles');
         } else if (options instanceof Role) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             role = options;
             Object.assign(role, relationOptions);
         } else {
@@ -1328,6 +1372,7 @@ export class App extends BaseNode {
         return node;
     }
 
+
     getModuleExistingNames(excludedList: Array<Module> = []) {
         const excludedSet = new Set(excludedList);
         return (this.dependencies || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1372,7 +1417,7 @@ export class App extends BaseNode {
                 name: options,
             }, this, 'dependencies');
         } else if (options instanceof Module) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             module = options;
             Object.assign(module, relationOptions);
         } else {
@@ -1505,7 +1550,7 @@ export class App extends BaseNode {
                 name: options,
             }, this, 'interfaceDependencies');
         } else if (options instanceof Module) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             module = options;
             Object.assign(module, relationOptions);
         } else {
@@ -1638,7 +1683,7 @@ export class App extends BaseNode {
                 name: options,
             }, this, 'componentDependencies');
         } else if (options instanceof Module) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             module = options;
             Object.assign(module, relationOptions);
         } else {
@@ -1735,6 +1780,9 @@ export class App extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
     * 删除实体
     * @param name 实体名称
@@ -1783,6 +1831,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除数据结构
     * @param name 数据结构名称
@@ -1831,6 +1881,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除枚举
     * @param name 枚举名称
@@ -1879,6 +1931,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除逻辑
     * @param name 逻辑名称
@@ -1927,6 +1981,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除接口
     * @param name 接口名称
@@ -1975,6 +2031,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除页面
     * @param name 页面名称
@@ -2023,6 +2081,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除流程
     * @param name 流程名称
@@ -2071,6 +2131,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除角色
     * @param name 角色名称
@@ -2119,6 +2181,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除主题
     * @param name 主题名称
@@ -2167,6 +2231,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除配置管理
     * @param name 配置管理名称
@@ -2215,6 +2281,8 @@ export class App extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除模块
     * @param name 模块名称
@@ -2240,6 +2308,8 @@ export class App extends BaseNode {
         return module.delete();
     }
 
+    
+
     /**
     * 删除模块
     * @param name 模块名称
@@ -2265,6 +2335,8 @@ export class App extends BaseNode {
         return module.delete();
     }
 
+    
+
     /**
     * 删除模块
     * @param name 模块名称
@@ -2438,26 +2510,30 @@ export class App extends BaseNode {
         return arr.length ? subView.findViewByPath(arr.join('/')) : subView;
     }
 
+    findViewByName(name: string): View {
+        return utils.traverse((current) => {
+            if (current.node.name === name)
+                return current.node;
+        }, { node: { name: '', children: this.views } });
+    }
+
     loadEnvList() {
         this.envList = ['dev', 'online'];
     }
 
-    public readonly packageInfo: {
+    // 必须先 loadPackageInfo 之后再生成代码
+    public packageInfo: {
         template: { name: string; version: string };
         ui: { name: string; version: string };
-    } = {
-        template: {
-            name: 'lcap-pc-template',
-            version: '0.4.13-beta',
-        },
-        ui: {
-            name: 'cloud-ui.vusion',
-            version: '0.14.8',
-        },
-    };
+    } = null;
 
     loadPackageInfo() {
         const dependencyMap = (window as any).globalData.ideVersionDetail.dependencies;
+        this.packageInfo = {
+            template: { name: '', version: '' },
+            ui: { name: '', version: '' },
+        };
+
         this.packageInfo.template.name = this.scope === 'h5' ? '@lcap/mobile-template' : 'lcap-pc-template';
         this.packageInfo.template.version = this.scope === 'h5' ? dependencyMap.FrontendArchH5.version : dependencyMap.FrontendArchPC.version;
         this.packageInfo.ui.name = this.scope === 'h5' ? '@lcap/mobile-ui' : 'cloud-ui.vusion';
@@ -2483,7 +2559,7 @@ export class App extends BaseNode {
 
                     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@0.7.10-beta/cloudAdminDesigner.umd.min.js` : `${prefix}/packages/lcap-pc-template@0.4.13-beta/cloudAdminDesigner.umd.min.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`,
                 ],
                 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`,
@@ -2499,7 +2575,9 @@ export class App extends BaseNode {
         this.componentDependencies.forEach((dep) => {
             const { name, version } = dep;
             result.custom.js.push(`${prefix}/packages/${name}@${version}/dist-theme/index.js`);
-            result.custom.css.push(`${prefix}/packages/${name}@${version}/dist-theme/index.css`);
+            if (utils.shouldLoadCss(name, version)) {
+                result.custom.css.push(`${prefix}/packages/${name}@${version}/dist-theme/index.css`);
+            }
             result.custom.names.push(name);
         });
         return result;
@@ -2522,7 +2600,7 @@ ${keys.map((key) => `    ${key}: ${this.theme?.variableMap[key]};`).join('\n')}
     //================================================================================
 }
 
-classMap.App = App;
+classMap['App'] = App;
 export default App;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Argument__.ts

@@ -1,5 +1,6 @@
 import { TranslatorState, shiftState, withSourceMap } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
+import StringLiteral from './StringLiteral__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -189,13 +190,13 @@ export class Argument extends LogicItem {
     }
 
     @withSourceMap()
-    toEmbeddedTS(state?: TranslatorState, isRequired?: boolean, isHaveKeyWord?: boolean): string {
+    toEmbeddedTS(state?: TranslatorState, isRequired: boolean = true, isHaveKeyWord?: boolean): string {
         let code = this.spread ? '...' : '';
         if (isHaveKeyWord) {
             code += `${this.tsKeyword}:`;
         }
         if (this.expression) {
-            code += this.expression.toEmbeddedTS(shiftState(state, code));
+            code += (this.expression as StringLiteral).toEmbeddedTS(shiftState(state, code), isRequired);
         } else {
             code += isRequired ? '__IDENTIFIER__' : 'undefined';
         }