@lcap/nasl 3.6.0-alpha.6 → 3.6.0-alpha.7

package/src/concepts/App__.ts

@@ -4156,7 +4156,7 @@ export class App extends BaseNode {
   findNodeByCompleteName(originCompleteName: string) {
     let completeName = originCompleteName;
     // 是否是来自编辑态的自定义连接器
-    const isFromEditableConnector = completeName.endsWith(CUSTOM_CONNECTOR_EDITABLE_SUFFIX);
+    const isFromEditableConnector = completeName?.endsWith(CUSTOM_CONNECTOR_EDITABLE_SUFFIX);
     if (isFromEditableConnector) {
       // 为了查找到真实的结构，需要去掉编辑态的后缀
       completeName = completeName.replace(CUSTOM_CONNECTOR_EDITABLE_SUFFIX, '');

package/src/concepts/BindAttribute__.ts

@@ -723,6 +723,8 @@ export class BindAttribute extends BaseNode {
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
 
+  toHump = (name: string) => (name ? name.replace(/\-(\w)/g, (all, letter) => letter.toUpperCase()) : '');
+
   onChange($event?: EventPayload): void {
     this.emit('change', $event);
   }
@@ -1084,30 +1086,90 @@ export class BindAttribute extends BaseNode {
   *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
     const self = this;
     const { name, type, value, rules, expression, playground } = self;
+    const humpName = self.toHump(name);
+
     let code = '';
+    if (!name) {
+      return code;
+    }
+
+    // 过滤掉vusion-的属性
+    if (/^vusion-/.test(name)) {
+      return code;
+    }
+
+    // 不翻译的属性
+    const excludeProps = [
+      'dataSchema',
+      'key',
+    ];
+    if (excludeProps.includes(humpName)) {
+      return code;
+    }
+
     // 业务组件
     const isBusinessComponent = self.viewElement?.isCorrespondingBusinessComponent;
-    if (isBusinessComponent) {
-      if (type === 'dynamic') {
-        code += `${name}: (() => {
-          return `;
+    // if (isBusinessComponent) {
+    //   code += `${name}: `;
+    // } else if (self?.name === 'data-source' && self?.expression?.concept === 'CallLogic') {
+    //   code += `() => {\n`;
+    // } else {
+    //   code += `() => {\n`;
+    // }
+
+    // feild属性需要特殊处理
+    if ([
+      'valueField',
+      'textField',
+      'parentField',
+      'childrenField',
+    ].includes(humpName)) {
+      if (type !== 'dynamic') {
+        code += `${self.toHump(name)}: item => item.${value}`;
       }
-    } else if (self?.name === 'data-source' && self?.expression?.concept === 'CallLogic') {
-      code += `() => {\n`;
-    } else {
-      code += '() => {\n';
+      return code;
     }
+
+    // 特殊处理dataSource
+    if (['dataSource'].includes(humpName)) {
+      code += `${humpName}: (()`;
+
+      if (!expression) {
+        code += ': any';
+      }
+
+      code += ' => {\n';
+
+      if (expression) {
+        if (expression.concept === 'Identifier') {
+          const { name: n } = expression;
+          code += `let result: typeof ${n} extends ((...args: any[]) => any) ? ReturnType<typeof ${n}> : typeof ${n};\n`;
+          code += `return result;\n`;
+        } else {
+          code += `return `;
+          code += yield* expression.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
+          code += ';\n';
+        }
+      }
+
+      code += `})()`
+      return code;
+    }
+
+    code += `${humpName}: ((): any => {\n`;
+    code += `return `;
+
     if (['destination', 'externalDestination'].includes(name) && type === 'dynamic') {
-      code += yield* (self as any)[name].toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
+      code += yield * (self as any)[name].toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
       code += ';\n';
     } else if (name === 'rules') {
-      yield* wrapForEach(rules, function* warpForEachGenerator(item, index) {
+      yield * wrapForEach(rules, function* warpForEachGenerator(item, index) {
         code += yield* item.toEmbeddedTS(shiftState(state, code));
         code += ';\n';
       });
     } else if (expression) {
       code += yield* expression.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
-      code += '\n';
+      code += ';\n';
     } else if (name === 'url' && value) {
       /**
        * ls定制化处理
@@ -1132,97 +1194,115 @@ export class BindAttribute extends BaseNode {
         code += `app.dataSources.${dataSourceName || 'defaultDS'}.entities.${entityName}`;
         code += ';\n';
       }
+    } else if (['static', 'string'].includes(type)) {
+      code += typeof value === 'boolean'
+        ? value
+        : ['true', 'false'].includes(value)
+          ? value.replace(/'/g, '')
+          : JSON.stringify(value);
+      code += ';\n';
     }
+
+
     if (type === 'dynamic') {
       yield* wrapForEach(playground, function* warpForEachGenerator(item, index) {
         code += yield* item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
         code += ';\n';
       });
     }
-    if (isBusinessComponent) {
-      if (type === 'dynamic') {
-        code += '\n})()';
-      }
-    } else {
-      code += '\n}';
-    }
-    return code;
-  }
 
-  @withGenerator
-  *toEmbeddedTSVariableDefinition(
-    state = createCompilerState(),
-    attrList?: string[],
-    elementName?: string,
-    currentLevel?: string,
-  ): TranslatorGenerator {
-    const self = this;
-    let code = '';
-    let arrCode = '';
-    code += indent((state?.tabSize || 0) + 3);
-    code += `${attrConvertCamelCase(self.name)}: `;
-    if (self.expression) {
-      if (self.name === 'data-source') {
-        code += `ReturnType<typeof __elements_stashFunctionVariable.${elementName}_${attrConvertCamelCase(self.name)}>`;
-      } else {
-        code += `ReturnType<typeof __elements_stashFunctionVariable.${elementName}_${attrConvertCamelCase(self.name)}>`;
-      }
-      arrCode = `() => {
-        return __elements_variable_function.${currentLevel}?.${attrConvertCamelCase(self.name)}?.()
-      }`;
-    } else if (self.name === 'sorting') {
-      code += `{
-              field: nasl.core.String
-              order: nasl.core.String
-          }`;
-    } else if (self.type === 'static') {
-      let type = 'nasl.core.String';
-      if (typeof self.value === 'number') {
-        type = `${self.value}`.includes('.') ? 'nasl.core.Decimal' : 'nasl.core.Long';
-      } else if (typeof self.value === 'boolean') {
-        type = 'nasl.core.Boolean';
-      } else if (['page-size', 'page-number'].includes(self.name) && self.value === null) {
-        type = 'nasl.core.Long'
-      }
-      code += `${type}`;
-    } else {
-      code += 'undefined';
-    }
-    code += `\n`;
-    if (arrCode.length > 0) {
-      attrList.push(`${elementName}_${attrConvertCamelCase(self.name)}: ${arrCode},\n`);
-    }
-    return code;
-  }
-  @withGenerator
-  *toEmbeddedTSVariableFunctionDefinition(state = createCompilerState()): TranslatorGenerator {
-    const self = this;
-    let code = '';
-    if (self.expression) {
-      code += indent((state?.tabSize || 0) + 4);
-      code += `${attrConvertCamelCase(self.name)}: `;
-      let stashVariable;
-      if (self.name === 'data-source') {
-        const extraParams = {
-          tabSize: 4,
-          inline: true,
-          noNeedParams: true,
-        };
-        stashVariable = `${yield* self.expression.toEmbeddedTS(
-          shiftState(state, code, self?.expression?.concept === 'CallLogic' ? extraParams : {}),
-        )}`;
-      } else {
-        stashVariable = `${yield* self.expression.toEmbeddedTS()}`;
-      }
-      code += `() => {\n`;
-      code += indent((state?.tabSize || 0) + 5);
-      code += `return ${stashVariable}\n`;
-      code += indent((state?.tabSize || 0) + 4);
-      code += `},\n`;
-    }
+    // if (type === 'dynamic' && !isBusinessComponent) {
+    //   yield* wrapForEach(playground, function* warpForEachGenerator(item, index) {
+    //     code += yield* item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
+    //     code += ';\n';
+    //   });
+    // }
+
+    // if (!isBusinessComponent) {
+    //   code += '\n}';
+    // }
+
+    code += `})()`
     return code;
   }
 
+  // 这个不用了
+  // @withGenerator
+  // *toEmbeddedTSVariableDefinition(
+  //   state = createCompilerState(),
+  //   attrList?: string[],
+  //   elementName?: string,
+  //   currentLevel?: string,
+  // ): TranslatorGenerator {
+  //   const self = this;
+  //   let code = '';
+  //   let arrCode = '';
+  //   code += indent((state?.tabSize || 0) + 3);
+  //   code += `${attrConvertCamelCase(self.name)}: `;
+  //   if (self.expression) {
+  //     if (self.name === 'dataSource') {
+  //       code += `ReturnType<typeof __elements_stashFunctionVariable.${elementName}_${attrConvertCamelCase(self.name)}>`;
+  //     } else {
+  //       code += `ReturnType<typeof __elements_stashFunctionVariable.${elementName}_${attrConvertCamelCase(self.name)}>`;
+  //     }
+  //     arrCode = `() => {
+  //       return __elements_variable_function.${currentLevel}?.${attrConvertCamelCase(self.name)}?.()
+  //     }`;
+  //   } else if (self.name === 'sorting') {
+  //     code += `{
+  //             field: nasl.core.String
+  //             order: nasl.core.String
+  //         }`;
+  //   } else if (self.type === 'static') {
+  //     let type = 'nasl.core.String';
+  //     if (typeof self.value === 'number') {
+  //       type = `${self.value}`.includes('.') ? 'nasl.core.Decimal' : 'nasl.core.Long';
+  //     } else if (typeof self.value === 'boolean') {
+  //       type = 'nasl.core.Boolean';
+  //     } else if (['page-size', 'page-number'].includes(self.name) && self.value === null) {
+  //       type = 'nasl.core.Long'
+  //     }
+  //     code += `${type}`;
+  //   } else {
+  //     code += 'undefined';
+  //   }
+  //   code += `\n`;
+  //   if (arrCode.length > 0) {
+  //     attrList.push(`${elementName}_${attrConvertCamelCase(self.name)}: ${arrCode},\n`);
+  //   }
+  //   return code;
+  // }
+
+  // 这个不用了
+  // @withGenerator
+  // *toEmbeddedTSRefTree(state = createCompilerState()): TranslatorGenerator {
+  //   const self = this;
+  //   let code = '';
+  //   if (self.expression) {
+  //     code += indent((state?.tabSize || 0) + 4);
+  //     code += `${attrConvertCamelCase(self.name)}: `;
+  //     let stashVariable;
+  //     if (self.name === 'dataSource') {
+  //       const extraParams = {
+  //         tabSize: 4,
+  //         inline: true,
+  //         noNeedParams: true,
+  //       };
+  //       stashVariable = `${yield* self.expression.toEmbeddedTS(
+  //         shiftState(state, code, self?.expression?.concept === 'CallLogic' ? extraParams : {}),
+  //       )}`;
+  //     } else {
+  //       stashVariable = `${yield* self.expression.toEmbeddedTS()}`;
+  //     }
+  //     code += `() => {\n`;
+  //     code += indent((state?.tabSize || 0) + 5);
+  //     code += `return ${stashVariable}\n`;
+  //     code += indent((state?.tabSize || 0) + 4);
+  //     code += `},\n`;
+  //   }
+  //   return code;
+  // }
+
   findCurrentElementParent(node: any): ViewElement | undefined {
     if (asserts.isViewElement(node.parentNode)) {
       if (

package/src/concepts/BindDirective__.ts

@@ -636,29 +636,55 @@ export class BindDirective extends BaseNode {
   @withSourceMapGenerator
   *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
     const self = this;
-    // 业务组件
-    const isBusinessComponent = self.viewElement?.correspondingBusinessComponent;
+    let { name } = self;
     let code = '';
-    if (!isBusinessComponent) {
-      code += '()=>{';
+    if (!name) {
+      return code;
     }
+    name = `_${name}`;
+
+    code += `${name}: ((): any => {\n`;
+
     if (self.expression) {
+      code += 'return ';
       code += yield* self.expression.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
-      code += '\n';
+      code += ';\n';
     }
+
+    // 草稿区
     if (self.type === 'dynamic') {
       yield* wrapForEach(self.playground, function* warpForEachGenerator(item, index) {
         code += yield* item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
         if (index !== self.playground.length - 1) code += '\n';
       });
     }
-    if (isBusinessComponent) {
-      if (code) {
-        code = `${self.name === 'if' ? '__NASLIF' : self.name}: ${code}`;
-      }
-    } else {
-      code += '}';
-    }
+
+    code += `})()`
+
+    // 业务组件
+    // const isBusinessComponent = self.viewElement?.correspondingBusinessComponent;
+
+    // if (!isBusinessComponent) {
+    //   code += '() => {';
+    // }
+    // if (self.expression) {
+    //   code += yield* self.expression.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
+    //   code += '\n';
+    // }
+    // if (self.type === 'dynamic') {
+    //   yield* wrapForEach(self.playground, function* warpForEachGenerator(item, index) {
+    //     code += yield* item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
+    //     if (index !== self.playground.length - 1) code += '\n';
+    //   });
+    // }
+    // if (isBusinessComponent) {
+    //   if (code) {
+    //     code = `${self.name === 'if' ? '__NASLIF' : self.name}: ${code}`;
+    //   }
+    // } else {
+    //   code += '}';
+    // }
+
     return code;
   }
 

package/src/concepts/BindEvent__.ts

@@ -660,9 +660,16 @@ export class BindEvent extends BaseNode {
       }
       return code;
     }
-    code = `${self.toHump(self.name) || '__IDENTIFIER__'}: (event: `;
+    code = `on${utils.kebab2Pascal(self.name) || '__IDENTIFIER__'}: (event`;
     // event的类型
-    code += yield* self.getEventTypeString(state);
+
+    // 业务组件
+    const businessComponent = this.element?.correspondingBusinessComponent;
+    if (businessComponent) {
+      code += `: `;
+      code += yield* self.getEventTypeString(state);
+    }
+
     code += ') => [\n';
     yield* wrapForEach(self.logics, function* warpForEachGenerator(logic) {
       // 一些默认的逻辑不翻译 排除掉

package/src/concepts/BindStyle__.ts

@@ -510,16 +510,39 @@ export class BindStyle extends BaseNode {
   @withSourceMapGenerator
   *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
     const self = this;
-    let code = '()=>{';
+    const { name } = self;
+    const humpName = utils.kebab2Camel2(name);
+    let code = '';
+
+    if (!name) {
+      return code;
+    }
+
+    code += `_${humpName}: ((): any => {\n`
+
     if (self.expression) {
+      code += 'return ';
       code += yield* self.expression.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
       code += ';\n';
     }
+
     yield* wrapForEach(self.playground, function* warpForEachGenerator(item, index) {
       code += yield* item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
       if (index !== self.playground.length - 1) code += ';\n';
     });
-    code += '}';
+    
+    code += `})()`
+
+    // let code = '()=>{';
+    // if (self.expression) {
+    //   code += yield* self.expression.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
+    //   code += ';\n';
+    // }
+    // yield* wrapForEach(self.playground, function* warpForEachGenerator(item, index) {
+    //   code += yield* item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
+    //   if (index !== self.playground.length - 1) code += ';\n';
+    // });
+    // code += '}';
     return code;
   }
 

package/src/concepts/BusinessComponent__.ts

@@ -12,6 +12,7 @@ import type App from './App__';
 import type FrontendType from './FrontendType__';
 import type Match from './Match__';
 import { ElementToVueOptions } from './ViewElement__';
+import { ComponentCompletionPropertyMap } from './View__'
 import translator from '../bak/translator';
 
 type AttrObject = {
@@ -1876,7 +1877,7 @@ export class BusinessComponent extends BaseNode {
     if (elements) {
       elements.forEach((item: ViewElement) => {
         const { bindAttrs = [], name } = item;
-        const isDataSource = bindAttrs.some((attr) => attr.name === 'data-source');
+        const isDataSource = bindAttrs.some((attr) => attr.name === 'dataSource');
         const isInclude = parentNodeNames.includes(name);
 
         allMethods.push(item);
@@ -2102,7 +2103,7 @@ export class BusinessComponent extends BaseNode {
       if (
         element.concept &&
         element.concept === 'ViewElement' &&
-        (element as ViewElement).bindAttrs.find((bAttr) => bAttr.name === 'data-source')
+        (element as ViewElement).bindAttrs.find((bAttr) => bAttr.name === 'dataSource')
       ) {
         viewElements.push(element as ViewElement);
       }
@@ -2117,7 +2118,7 @@ export class BusinessComponent extends BaseNode {
       const currentIndex = viewElementsWithDataSource.length - 1 - index;
       const currentItemCode = `current${currentIndex === 0 ? '' : currentIndex}.item`;
       if (code.includes(currentItemCode)) {
-        const dataSource = viewElement.bindAttrs.find((bAttr) => bAttr.name === 'data-source');
+        const dataSource = viewElement.bindAttrs.find((bAttr) => bAttr.name === 'dataSource');
         if (dataSource) {
           const businessComponent = viewElement.getAncestor('BusinessComponent') as BusinessComponent;
           const dataSourceTS = yield* dataSource.expression.toEmbeddedTS();
@@ -2231,7 +2232,7 @@ export class BusinessComponent extends BaseNode {
   elementsAttrs(elements: Array<ViewElement>, componentList: Array<ViewElement>) {
     if (elements) {
       elements.forEach((item: ViewElement) => {
-        if (PAGE_COMPONENT_INCLUDE_TAG_MAP?.[item.tag]) {
+        if (ComponentCompletionPropertyMap?.[item.tag]) {
           componentList.push(item);
         }
         if (item.children.length > 0) {
@@ -2244,7 +2245,7 @@ export class BusinessComponent extends BaseNode {
   elementsAttrsAll(elements: Array<ViewElement>, componentListExtra: Array<ViewElement>) {
     if (elements) {
       elements.forEach((item: ViewElement) => {
-        if (!PAGE_COMPONENT_INCLUDE_TAG_MAP?.[item.tag]) {
+        if (!ComponentCompletionPropertyMap?.[item.tag]) {
           componentListExtra.push(item);
         }
         if (item.children.length > 0) {
@@ -2265,7 +2266,7 @@ export class BusinessComponent extends BaseNode {
      * 这部分需要先执行
      **/
     // elements类型声明定义
-    let code = `interface __elements {\n`;
+    let code = `interface IElements {\n`;
     // 生成所有的name和类型定义
     yield* wrapForEach(self.elements, function* warpForEachGenerator(element) {
       code += yield* element.toEmbeddedTSDefinition(
@@ -2275,33 +2276,58 @@ export class BusinessComponent extends BaseNode {
       );
     });
     code += `${indent((state?.tabSize || 0) + 1)}}\n`;
-    code += `let __elements: __elements;\n`;
+    code += `let __elements: IElements;\n`;
 
     if (Array.isArray(self.elements)) {
-      code += `${indent((state?.tabSize || 0) + 1)}interface `;
-      code += `__elements_completionProperty {\n`;
-      const componentList: Array<ViewElement> = [];
-      self.elementsAttrs(self.elements, componentList);
-      const variableList: string[] = [];
-      yield* wrapForEach(self.elements, function* warpForEachGenerator(item) {
-        code += yield* item.toEmbeddedTSVariableDefinition(shiftState(state, code, { inline: true }), variableList);
-      });
-      code += indent((state?.tabSize || 0) + 1) + `}\n`;
-      code += indent((state?.tabSize || 0) + 1);
-      code += `let __elements_completionProperty: __elements_completionProperty;\n`;
-      code += indent((state?.tabSize || 0) + 1);
-      code += `let __elements_variable_function = {\n`;
+      // __elementsRef
+      const elementsPathMap: Record<string, string> = {};
+
+      // elementsRefTree
+      code += `function elementsRefTree() {\n`;
+      code += `return {\n`;
+      code += `children: {\n`;
       yield* wrapForEach(self.elements, function* warpForEachGenerator(item) {
-        code += yield* item.toEmbeddedTSVariableFunctionDefinition(shiftState(state, code, { inline: true }));
-      });
-      code += indent((state?.tabSize || 0) + 1) + `}\n`;
-      code += indent((state?.tabSize || 0) + 1);
-      code += `let __elements_stashFunctionVariable = {\n`;
-      yield* wrapForEach(variableList, function* warpForEachGenerator(item) {
-        code += indent((state?.tabSize || 0) + 2);
-        code += `${item}`;
+        code += yield* item.toEmbeddedTSRefTree(shiftState(state, code, { inline: true }), elementsPathMap);
       });
-      code += indent((state?.tabSize || 0) + 1) + `}\n`;
+      code += `},\n`;
+      code += `};\n`;
+      code += `};\n`;
+
+      code += `const __elementsRef = {\n`;
+      for (const key in elementsPathMap) {
+        const pathStr = elementsPathMap[key];
+        const pathArr = pathStr.split('.');
+        const path = pathArr.reduce((prev: string, cur: string) => {
+          return `${prev}.children.${cur}()`;
+        }, 'elementsRefTree()')
+        code += `${indent((state?.tabSize || 0) + 1)}${key}: ${path},\n`;
+      }
+      code += `};\n`;
+
+      // code += `${indent((state?.tabSize || 0) + 1)}interface `;
+      // code += `__elements_completionProperty {\n`;
+      // const componentList: Array<ViewElement> = [];
+      // self.elementsAttrs(self.elements, componentList);
+      // const variableList: string[] = [];
+      // yield* wrapForEach(self.elements, function* warpForEachGenerator(item) {
+      //   code += yield* item.toEmbeddedTSVariableDefinition(shiftState(state, code, { inline: true }), variableList);
+      // });
+      // code += indent((state?.tabSize || 0) + 1) + `}\n`;
+      // code += indent((state?.tabSize || 0) + 1);
+      // code += `let __elements_completionProperty: __elements_completionProperty;\n`;
+      // code += indent((state?.tabSize || 0) + 1);
+      // code += `let __elements_variable_function = {\n`;
+      // yield* wrapForEach(self.elements, function* warpForEachGenerator(item) {
+      //   code += yield* item.toEmbeddedTSVariableFunctionDefinition(shiftState(state, code, { inline: true }));
+      // });
+      // code += indent((state?.tabSize || 0) + 1) + `}\n`;
+      // code += indent((state?.tabSize || 0) + 1);
+      // code += `let __elements_stashFunctionVariable = {\n`;
+      // yield* wrapForEach(variableList, function* warpForEachGenerator(item) {
+      //   code += indent((state?.tabSize || 0) + 2);
+      //   code += `${item}`;
+      // });
+      // code += indent((state?.tabSize || 0) + 1) + `}\n`;
     }
 
     const advanceMap: Map<Variable, Assignment | BatchAssignment> = new Map();
@@ -2434,7 +2460,7 @@ export class BusinessComponent extends BaseNode {
 
     code += `${indent(state?.tabSize || 0)}}\n`;
 
-    code += `export class ${self.tsName} extends nasl.ui.VueComponent {\n`;
+    code += `export class ${self.tsName} extends nasl.ui.ViewComponent {\n`;
 
     // 需要类型推导的局部变量/返回值需要调整申明顺序
     code += `constructor(

package/src/concepts/CallLogic__.ts

@@ -764,7 +764,7 @@ export class CallLogic extends LogicItem {
     if (concept === 'CallLogic') {
       const bindAttr = this.getAncestor('BindAttribute');
 
-      if (bindAttr?.name === 'data-source') {
+      if (bindAttr?.name === 'dataSource') {
         if (calleeNamespace) {
           const currentElement = this.getAncestor('ViewElement') as ViewElement;
           code += `__${currentElement.name}_dataSourceLoad`;
@@ -813,7 +813,7 @@ export class CallLogic extends LogicItem {
     if (concept === 'CallLogic') {
       const bindAttr = this.getAncestor('BindAttribute');
 
-      if (bindAttr?.name === 'data-source') {
+      if (bindAttr?.name === 'dataSource') {
         return this.calleeName;
       }
       if (calleeName === 'jsonSerialize') {
@@ -1262,7 +1262,7 @@ export class CallLogic extends LogicItem {
       const paramRequired = ['showMessage', 'consoleLog', 'jsonDeserialize', 'jsonSerialize'].includes(calleeName);
       if (
         ['expression'].includes(parentKey) &&
-        self.getAncestor('BindAttribute')?.name === 'data-source' &&
+        self.getAncestor('BindAttribute')?.name === 'dataSource' &&
         (state as any)?.noNeedParams
       ) {
         return;
@@ -1281,7 +1281,7 @@ export class CallLogic extends LogicItem {
       } else if (completeArguments.length) {
         if (
           ['expression'].includes(parentKey) &&
-          self.getAncestor('BindAttribute')?.name === 'data-source' &&
+          self.getAncestor('BindAttribute')?.name === 'dataSource' &&
           (state as any)?.noNeedParams
         ) {
           return;
@@ -1296,7 +1296,7 @@ export class CallLogic extends LogicItem {
       } else {
         if (
           ['expression'].includes(parentKey) &&
-          self.getAncestor('BindAttribute')?.name === 'data-source' &&
+          self.getAncestor('BindAttribute')?.name === 'dataSource' &&
           (state as any)?.noNeedParams
         ) {
           return;
@@ -1504,6 +1504,15 @@ export class CallLogic extends LogicItem {
     } else if (this.calleeNamespace?.startsWith('nasl.')) {
       // 如果是页面组件
       node = getNaslNodeByNodeCallee(this.calleeNamespace, this.calleeName);
+    } else if (this.calleeNamespace?.startsWith('elements.')) {
+      // 查找组件的逻辑，用于展示默认值
+      const elementsLogic = (this.app as any)?.naslServer?.elementsLogic || {};
+      let elementName: string = this.calleeNamespace.split('.')[1];
+      // eslint-disable-next-line prefer-destructuring
+      elementName = elementName.split('_')[0];
+      elementName = elementName[0].toUpperCase() + elementName.slice(1);
+      const logics = elementsLogic[`U${elementName}`] || elementsLogic[`Van${elementName}`] || [];
+      node = logics.find((l: any) => l.name === this.calleeName);
     } else {
       // 如果是其余app下自定义逻辑
       try {

package/src/concepts/Identifier__.ts

@@ -229,12 +229,12 @@ export class Identifier extends LogicItem {
       return `__obj.${this.name}`;
     }
     // 只有data-source可以是函数 ，也可能是属性
-    if (asserts.isBindAttribute(self.parentNode) && self.parentNode.name === 'data-source') {
+    if (asserts.isBindAttribute(self.parentNode) && ['data-source', 'dataSource'].includes(self.parentNode.name)) {
       const view = self.view || self.getAncestor('BusinessComponent') as BusinessComponent;
       const viewLogics = view.logics;
       const findLogic = viewLogics.find((item) => item.name === self.name);
       if (findLogic) {
-        return self.name;
+        return `${self.name}`;
       }
     }
     // 全局变量在不是页面的地方放置，就会报错