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

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;
+
     /**
      * 是否有用户中心
      */
@@ -199,6 +211,29 @@ export class App extends BaseNode {
         }
         return params;
     }
+    /**
+     * 设置制品应用标题
+     */
+    setDocumentTitle(documentTitle: string) {
+        const object = {
+            documentTitle,
+        };
+        this.update({
+            ...object,
+        });
+    }
+
+    /**
+     * 设置制品应用图标
+     */
+    setDocumentIcon(documentIcon: string) {
+        const object = {
+            documentIcon,
+        };
+        this.update({
+            ...object,
+        });
+    }
 
     getEntityExistingNames(excludedList: Array<Entity> = []) {
         const excludedSet = new Set(excludedList);
@@ -244,7 +279,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 {
@@ -385,7 +420,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 {
@@ -526,7 +561,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 {
@@ -667,7 +702,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 {
@@ -808,7 +843,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 {
@@ -949,7 +984,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 {
@@ -1090,7 +1125,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 {
@@ -1231,7 +1266,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 {
@@ -1372,7 +1407,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 +1540,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 +1673,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 {
@@ -2438,6 +2473,13 @@ 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'];
     }
@@ -2483,7 +2525,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`,

package/src/concepts/Argument__.ts

@@ -12,6 +12,7 @@ import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import LogicItem from './LogicItem__';
+import StringLiteral from './StringLiteral__';
 
 /**
  * 实际参数
@@ -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';
         }

package/src/concepts/BinaryExpression__.ts

@@ -188,9 +188,9 @@ export class BinaryExpression extends LogicItem {
             return code;
         }
         let code = '';
-        code += this.left?.toVue ? this.left.toVue() : '';
+        code += '(' + (this.left?.toVue() || '') + ')';
         code += ` ${this.operator} `;
-        code += this.right?.toVue ? this.right.toVue() : '';
+        code += '(' + (this.right?.toVue() || '') + ')';
         return code;
     }
 
@@ -206,12 +206,14 @@ export class BinaryExpression extends LogicItem {
             code += '.' + fnName + '(';
             code += this.right?.toUI ? this.right.toUI(shiftState(state, code, { inline: true })) : '';
             code += ')';
+            console.log(code);
             return code;
         }
         let code = '';
-        code += this.left?.toUI ? this.left.toUI(shiftState(state, code, { inline: true })) : '';
+        code += '(' + (this.left?.toUI(shiftState(state, code, { inline: true })) || '') + ')';
         code += ` ${this.operator} `;
-        code += this.right?.toUI ? this.right.toUI(shiftState(state, code, { inline: true })) : '';
+        code += '(' + (this.right?.toUI(shiftState(state, code, { inline: true })) || '') + ')';
+        console.log(code);
         return code;
     }
 
@@ -230,9 +232,9 @@ export class BinaryExpression extends LogicItem {
             return code;
         }
         let code = '';
-        code += '(' + this.left?.toJS ? this.left.toJS(shiftState(state, code, { inline: true })) : '' + ')';
+        code += '(' + (this.left?.toJS(shiftState(state, code, { inline: true })) || '') + ')';
         code += ` ${this.operator} `;
-        code += '(' + this.right?.toJS ? this.right.toJS(shiftState(state, code, { inline: true })) : '' + ')';
+        code += '(' + (this.right?.toJS(shiftState(state, code, { inline: true })) || '') + ')';
         return code;
     }
 

package/src/concepts/BindAttribute__.ts

@@ -196,7 +196,7 @@ export class BindAttribute extends BaseNode {
         });
     }
 
-        getValidationRuleExistingNames(excludedList: Array<ValidationRule> = []) {
+    getValidationRuleExistingNames(excludedList: Array<ValidationRule> = []) {
         const excludedSet = new Set(excludedList);
         return (this.rules || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -205,24 +205,24 @@ export class BindAttribute extends BaseNode {
     }
 
     /**
-    * 插入验证规则
-    * @internal
-    * @param name 验证规则名称，如果不填会自动生成一个唯一名称
-    */
+     * 插入验证规则
+     * @internal
+     * @param name 验证规则名称，如果不填会自动生成一个唯一名称
+     */
     _insertValidationRuleAt(name: string, index: number): ValidationRule;
 
     /**
-    * 插入验证规则
-    * @internal
-    * @param validationRuleOptions 验证规则参数
-    */
+     * 插入验证规则
+     * @internal
+     * @param validationRuleOptions 验证规则参数
+     */
     _insertValidationRuleAt(validationRuleOptions: Partial<ValidationRule>, index: number): ValidationRule;
 
     /**
-    * 插入验证规则
-    * @internal
-    * @param validationRule 已有的验证规则实例
-    */
+     * 插入验证规则
+     * @internal
+     * @param validationRule 已有的验证规则实例
+     */
     _insertValidationRuleAt(validationRule: ValidationRule, index: number): ValidationRule;
 
     _insertValidationRuleAt(options: string | Partial<ValidationRule> | ValidationRule, index: number) {
@@ -240,7 +240,7 @@ export class BindAttribute extends BaseNode {
                 name: options,
             }, this, 'rules');
         } else if (options instanceof ValidationRule) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             validationRule = options;
             Object.assign(validationRule, relationOptions);
         } else {
@@ -337,13 +337,10 @@ export class BindAttribute extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
-    * 删除逻辑项
-    * @param name 逻辑项名称
-    */
+     * 删除逻辑项
+     * @param name 逻辑项名称
+     */
     removeExpression(name: string): void;
 
     /**
@@ -365,12 +362,10 @@ export class BindAttribute extends BaseNode {
         return expression.delete();
     }
 
-    
-
     /**
-    * 删除跳转页面
-    * @param name 跳转页面名称
-    */
+     * 删除跳转页面
+     * @param name 跳转页面名称
+     */
     removeDestination(name: string): void;
 
     /**
@@ -392,12 +387,10 @@ export class BindAttribute extends BaseNode {
         return destination.delete();
     }
 
-    
-
     /**
-    * 删除验证规则
-    * @param name 验证规则名称
-    */
+     * 删除验证规则
+     * @param name 验证规则名称
+     */
     removeValidationRuleInRules(name: string): void;
 
     /**
@@ -472,8 +465,9 @@ export class BindAttribute extends BaseNode {
             value = value.replace(/"/g, "'");
         }
         if (this.name === 'destination' && this.type === 'dynamic') {
-            return this.destination.toVue(options);
+            return this.destination ? this.destination.toVue(options) : '';
         } else if (this.name === 'rules' && this.rules) {
+            console.log('this.rules: ', this.rules);
             const ruleStrs = this.rules.map((rule) => rule.toVue());
             value = ruleStrs.join(' | ');
             return value !== undefined && value !== null ? `${this.name}="${value}"` : '';
@@ -500,7 +494,7 @@ export class BindAttribute extends BaseNode {
     //================================================================================
 }
 
-classMap['BindAttribute'] = BindAttribute;
+classMap.BindAttribute = BindAttribute;
 export default BindAttribute;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/BindDirective__.ts

@@ -133,14 +133,10 @@ export class BindDirective extends BaseNode {
         });
     }
 
-    
-
-    
-
     /**
-    * 删除逻辑项
-    * @param name 逻辑项名称
-    */
+     * 删除逻辑项
+     * @param name 逻辑项名称
+     */
     removeExpression(name: string): void;
 
     /**
@@ -223,7 +219,26 @@ export class BindDirective extends BaseNode {
             value = value?.replace(/"/g, "'");
         }
         if (this.name === 'auth' && !!this.value) {
-            value = `'/${this.view.name}/${this.element.name}'`;
+            const regex = /(.\w+\[name=\w+\])/g;
+            const paths = this.element.nodePath.match(regex);
+            const regex1 = /\s*=(\w+)\]/;
+            let pathArr: string[] = [];
+            const isElement = paths.find((item) => {
+                if (item.startsWith('.elements')) {
+                    return true;
+                } else {
+                    pathArr.push(item);
+                    return false;
+                }
+            });
+            if (isElement) {
+                pathArr = [...pathArr, ...paths.slice(-1)];
+            }
+            const _path = pathArr.reduce((str, item) => {
+                const c = item.match(regex1);
+                return str + '/' + c[1];
+            }, '');
+            value = `'${_path}'`;
         }
         return value !== '' && value !== undefined && value !== null ? `v-${this.name}${modifiersString}${this.arg ? ':' + this.arg : ''}="${value}"` : '';
     }
@@ -234,7 +249,7 @@ export class BindDirective extends BaseNode {
     //================================================================================
 }
 
-classMap['BindDirective'] = BindDirective;
+classMap.BindDirective = BindDirective;
 export default BindDirective;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/BindEvent__.ts

@@ -142,22 +142,18 @@ export class BindEvent extends BaseNode {
         });
     }
 
-    
-
-    
-
     /**
-    * 插入实际参数
-    * @internal
-    * @param argumentOptions 实际参数参数
-    */
+     * 插入实际参数
+     * @internal
+     * @param argumentOptions 实际参数参数
+     */
     _insertArgumentAt(argumentOptions: Partial<Argument>, index: number): Argument;
 
     /**
-    * 插入实际参数
-    * @internal
-    * @param argument 已有的实际参数实例
-    */
+     * 插入实际参数
+     * @internal
+     * @param argument 已有的实际参数实例
+     */
     _insertArgumentAt(argument: Argument, index: number): Argument;
 
     _insertArgumentAt(options: Partial<Argument> | Argument, index: number) {
@@ -165,7 +161,7 @@ export class BindEvent extends BaseNode {
         const relationOptions = { parentNode: this, parentKey: 'arguments' };
         let argument: Argument;
         if (options instanceof Argument) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             argument = options;
             Object.assign(argument, relationOptions);
         } else {
@@ -178,8 +174,6 @@ export class BindEvent extends BaseNode {
         return argument;
     }
 
-    
-
     /**
      * 插入实际参数
      * @param argumentOptions 实际参数参数
@@ -202,8 +196,6 @@ export class BindEvent extends BaseNode {
         return node;
     }
 
-    
-
     /**
      * 添加实际参数
      * @internal
@@ -223,8 +215,6 @@ export class BindEvent extends BaseNode {
         return this._insertArgumentAt(options as any, index);
     }
 
-    
-
     /**
      * 添加实际参数
      * @param argumentOptions 实际参数参数
@@ -248,9 +238,6 @@ export class BindEvent extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
      * 删除实际参数
      * @param argument 已有的实际参数实例
@@ -258,7 +245,7 @@ export class BindEvent extends BaseNode {
     removeArgument(argument: Argument): void;
 
     removeArgument(options: Argument) {
-        let argument: Argument = options;
+        const argument: Argument = options;
         return argument.delete();
     }
 
@@ -289,7 +276,10 @@ export class BindEvent extends BaseNode {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
-
+    // 用于logic回填
+    get calleewholeKey(): string {
+        return this.calleeNamespace + '.' + this.calleeName;
+    }
     get tsCalleeNamespace() {
         if (this.calleeNamespace) {
             let tsCalleeNamespace = this.calleeNamespace;
@@ -326,7 +316,7 @@ export class BindEvent extends BaseNode {
         return `${randerNameSpace}.${this.calleeName}`;
     }
     // 绑定事件转驼峰
-    toHump = (name: string) => name ? name.replace(/\-(\w)/g, (all, letter) => letter.toUpperCase()) : '';
+    toHump = (name: string) => (name ? name.replace(/\-(\w)/g, (all, letter) => letter.toUpperCase()) : '');
 
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState, isPageCycle?: Boolean): string {
@@ -388,10 +378,16 @@ export class BindEvent extends BaseNode {
                 componentName = namespaceArr[0];
             }
         }
-        const calleeName = isComponentLogic ? `$refs.${componentName}.${this.calleeName}` : this.calleeName;
+        let callee = '';
+        if (isComponentLogic)
+            callee = `$refs.${componentName}.${this.calleeName}`;
+        else if (calleeNamespace?.startsWith('nasl.'))
+            callee = `$global.${this.calleeName}`;
+        else
+            callee = this.calleeName;
         let code = '';
-        if (calleeName) {
-            code += `@${this.name}="${calleeName}`;
+        if (callee) {
+            code += `@${this.name}="${callee}`;
             if (Array.isArray(this.arguments) && this.arguments.length) {
                 code += '(';
                 this.arguments.forEach((arg, index) => {
@@ -413,7 +409,7 @@ export class BindEvent extends BaseNode {
     //================================================================================
 }
 
-classMap['BindEvent'] = BindEvent;
+classMap.BindEvent = BindEvent;
 export default BindEvent;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/CallFunction__.ts

@@ -105,7 +105,7 @@ export class CallFunction extends LogicItem {
         const relationOptions = { parentNode: this, parentKey: 'typeArguments' };
         let typeAnnotation: TypeAnnotation;
         if (options instanceof TypeAnnotation) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             typeAnnotation = options;
             Object.assign(typeAnnotation, relationOptions);
         } else {
@@ -212,7 +212,7 @@ export class CallFunction extends LogicItem {
         const relationOptions = { parentNode: this, parentKey: 'arguments' };
         let argument: Argument;
         if (options instanceof Argument) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             argument = options;
             Object.assign(argument, relationOptions);
         } else {
@@ -429,7 +429,7 @@ export class CallFunction extends LogicItem {
             const argument = Argument.from({
                 keyword: param.name,
             }, this);
-            if(param.defaultExpression instanceof Identifier) {
+            if (param.defaultExpression instanceof Identifier) {
                 argument.expression = BaseNode.from(param.defaultExpression, argument, 'expression') as Identifier;
             }
             Object.assign(argument, relationOptions);
@@ -470,12 +470,17 @@ export class CallFunction extends LogicItem {
             code += ')';
             // 如果有内容
             const typeAnnotation = this.typeArguments[0];
-            if (typeAnnotation.typeNamespace && typeAnnotation.typeName) {
-                code += `<${typeAnnotation.typeNamespace}.${typeAnnotation.typeName}>()`;
-            }
+            code += `<`;
+            code += `${typeAnnotation.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }))}>()`;
             code += '\n';
         } else {
             code = this.calleeKey;
+            if (Array.isArray(this.typeArguments) && this.typeArguments.length) {
+                // 如果有内容
+                const typeAnnotation = this.typeArguments[0];
+                code += `<`;
+                code += `${typeAnnotation.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }))}>`;
+            }
             code += '(';
             this.arguments.forEach((arg, index) => {
                 code += arg.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }));

package/src/concepts/CallInterface__.ts

@@ -97,7 +97,7 @@ export class CallInterface extends LogicItem {
         const relationOptions = { parentNode: this, parentKey: 'arguments' };
         let argument: Argument;
         if (options instanceof Argument) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             argument = options;
             Object.assign(argument, relationOptions);
         } else {
@@ -317,6 +317,16 @@ export class CallInterface extends LogicItem {
         const _interface = _module?.interfaces?.find((item) => item.name === _keys[3]);
         if (_interface) {
             params = _interface.params.filter((item) => item.required).map((item) => item.name) || [];
+            const _bodyParams = _interface.params.find((item) => item.name === 'Body');
+            if (_bodyParams) {
+                const _typeKey = _bodyParams.typeAnnotation.typeKey;
+                const _list = _typeKey.split('.');
+                const _structure = _module.structures.find((item) => item.name === _list[3]);
+                const isBodyRequired = _structure.properties.some((item) => item.required === true);
+                if (isBodyRequired) {
+                    params.push('Body');
+                }
+            }
         }
         code += '({';
         this.arguments.forEach((arg, index) => {