@lcap/nasl 3.4.0-beta.5 → 3.4.0-beta.6

package/src/concepts/ViewElement__.ts

@@ -1,4 +1,14 @@
-import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
+import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
+import {
+  TranslatorState,
+  shiftState,
+  withSourceMap,
+  indent,
+  createCompilerState,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 import { stdlibNamespace, CallLogic } from '../concepts';
 
 import * as babelParser from '@babel/parser';
@@ -1588,59 +1598,67 @@ export class ViewElement extends BaseNode {
     return Boolean(this.slotScope);
   }
 
-  toEmbeddedTSDefinition(state?: TranslatorState): string {
+  @withGenerator
+  *toEmbeddedTSDefinition(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
     let code = '';
     code += indent((state?.tabSize || 0) + 1);
     // 登录组件不翻译
-    if (this.toHump(this.tag) === 'lcapLogin' || this.staticClass === 'login-form') {
-      code += `${this.name}: nasl.ui.div<any>;\n`;
-    } else if (this.tag === 'u-table-view-column-dynamic') {
-      code += `${this.name}: nasl.ui.${this.toHump(this.tag)}<any, any>;\n`;
-    } else if (Object.keys(PAGE_COMPONENT_INCLUDE_TAG_MAP).includes(this.tag)) {
-      if (this.bindAttrs?.findIndex((attr) => attr.name === 'data-source') > -1) {
-        code += `${this.name}: nasl.ui.${this.toHump(this.tag)}<__elements_completionProperty['${this.name
+    if (self.toHump(self.tag) === 'lcapLogin' || self.staticClass === 'login-form') {
+      code += `${self.name}: nasl.ui.div<any>;\n`;
+    } else if (self.tag === 'u-table-view-column-dynamic') {
+      code += `${self.name}: nasl.ui.${self.toHump(self.tag)}<any, any>;\n`;
+    } else if (Object.keys(PAGE_COMPONENT_INCLUDE_TAG_MAP).includes(self.tag)) {
+      if (self.bindAttrs?.findIndex((attr) => attr.name === 'data-source') > -1) {
+        code += `${self.name}: nasl.ui.${self.toHump(self.tag)}<__elements_completionProperty['${self.name
           }']['dataSource']>;\n`;
       } else {
-        code += `${this.name}: nasl.ui.${this.toHump(this.tag)}<any>;\n`;
+        code += `${self.name}: nasl.ui.${self.toHump(self.tag)}<any>;\n`;
       }
     } else {
-      code += `${this.name}: nasl.ui.${this.toHump(this.tag)}<any>;\n`;
+      code += `${self.name}: nasl.ui.${self.toHump(self.tag)}<any>;\n`;
     }
-    if (Array.isArray(this.children)) {
-      this.children.forEach((element) => {
-        code += element.toEmbeddedTSDefinition(shiftState(state, code));
+    if (Array.isArray(self.children)) {
+      yield* wrapForEach(self.children, function* warpForEachGenerator(element) {
+        code += yield* element.toEmbeddedTSDefinition(shiftState(state, code));
       });
     }
     return code;
   }
 
-  toEmbeddedTSVariableDefinition(state?: TranslatorState, variableList?: string[], nameLevel?: string): string {
+  @withGenerator
+  *toEmbeddedTSVariableDefinition(
+    state = createCompilerState(),
+    variableList?: string[],
+    nameLevel?: string,
+  ): TranslatorGenerator {
+    const self = this;
     let code = '';
     let currentLevel = nameLevel ? `${nameLevel}?.` : '';
-    currentLevel += `${this.name}?.()`;
-    if (PAGE_COMPONENT_INCLUDE_TAG_MAP?.[this.tag]) {
+    currentLevel += `${self.name}?.()`;
+    if (PAGE_COMPONENT_INCLUDE_TAG_MAP?.[self.tag]) {
       code += indent((state?.tabSize || 0) + 2);
-      code += `${this.name}: {\n`;
-      if (Array.isArray(this.bindAttrs)) {
-        this.bindAttrs
-          .filter((attr) => PAGE_COMPONENT_INCLUDE_TAG_MAP[this.tag]?.[attr.name])
-          .forEach((attr) => {
-            code += attr.toEmbeddedTSVariableDefinition(
+      code += `${self.name}: {\n`;
+      if (Array.isArray(self.bindAttrs)) {
+        yield* wrapForEach(
+          self.bindAttrs.filter((attr) => PAGE_COMPONENT_INCLUDE_TAG_MAP[self.tag]?.[attr.name]),
+          function* warpForEachGenerator(attr) {
+            code += yield* attr.toEmbeddedTSVariableDefinition(
               shiftState(state, code, { inline: true }),
               variableList,
-              this.name,
+              self.name,
               currentLevel,
             );
-          });
-
-        if (['u-select', 'van-pickerson'].includes(this.tag)) {
+          },
+        );
+        if (['u-select', 'van-pickerson'].includes(self.tag)) {
           code += indent((state?.tabSize || 0) + 3);
           code += `pageNumber: nasl.core.Long\n`;
           code += indent((state?.tabSize || 0) + 3);
           code += `filterText: nasl.core.String\n`;
         } else if (
-          ['u-list-view', 'u-grid-view', 'u-table-view', 'van-list-view', 'van-grid-view'].includes(this.tag) &&
-          this.bindAttrs?.findIndex((attr) => attr.name === 'sorting') === -1
+          ['u-list-view', 'u-grid-view', 'u-table-view', 'van-list-view', 'van-grid-view'].includes(self.tag) &&
+          self.bindAttrs?.findIndex((attr) => attr.name === 'sorting') === -1
         ) {
           code += indent((state?.tabSize || 0) + 3);
           code += `sorting: {
@@ -1652,22 +1670,24 @@ export class ViewElement extends BaseNode {
       code += indent((state?.tabSize || 0) + 2);
       code += `};\n`;
     }
-    if (Array.isArray(this.children)) {
-      this.children.forEach((element) => {
-        code += element.toEmbeddedTSVariableDefinition(shiftState(state, code), variableList, currentLevel);
+    if (Array.isArray(self.children)) {
+      yield* wrapForEach(self.children, function* warpForEachGenerator(element) {
+        code += yield* element.toEmbeddedTSVariableDefinition(shiftState(state, code), variableList, currentLevel);
       });
     }
     return code;
   }
 
-  toEmbeddedTSVariableFunctionDefinition(state?: TranslatorState, parentLevel?: number): string {
+  @withGenerator
+  *toEmbeddedTSVariableFunctionDefinition(state = createCompilerState(), parentLevel?: number): TranslatorGenerator {
+    const self = this;
     let code = '';
     code += indent((state?.tabSize || 0) + 2);
     let levelIndex = parentLevel || 0;
-    code += `${this.name}: () => {\n`;
-    if (this.tag === 'template' && this.haveScope() && this.parentNode instanceof ViewElement) {
-      const currentType = this.parentNode.tag === 'u-table-view-column-dynamic' ? 'CurrentDynamic' : 'Current';
-      const _this = this.parentNode;
+    code += `${self.name}: () => {\n`;
+    if (self.tag === 'template' && self.haveScope() && self.parentNode instanceof ViewElement) {
+      const currentType = self.parentNode.tag === 'u-table-view-column-dynamic' ? 'CurrentDynamic' : 'Current';
+      const _this = self.parentNode;
       let genericity = '';
       if (_this.tag === 'u-table-view-column-dynamic') {
         genericity += `<${(_this.parentNode as any).__tsVariableDataSourceTypeName}, ${(_this as any).__tsVariableDataSourceTypeName
@@ -1683,10 +1703,10 @@ export class ViewElement extends BaseNode {
       code += `let current${levelIndex === 0 ? '' : levelIndex}: nasl.ui.${currentType}${genericity}\n`;
       levelIndex++;
     }
-    const attr = this.bindAttrs?.find((item) => item.name === 'data-source');
+    const attr = self.bindAttrs?.find((item) => item.name === 'data-source');
     if (attr && attr.expression) {
-      const datasourceName = `datasourceName${this.name}`;
-      (this as any).__tsVariableDataSourceTypeName = datasourceName;
+      const datasourceName = `datasourceName${self.name}`;
+      (self as any).__tsVariableDataSourceTypeName = datasourceName;
       if (
         attr.expression instanceof MemberExpression ||
         attr.expression instanceof Identifier ||
@@ -1697,7 +1717,7 @@ export class ViewElement extends BaseNode {
           inline: true,
           noNeedParams: true,
         };
-        let value = attr.expression.toEmbeddedTS(
+        let value = yield* attr.expression.toEmbeddedTS(
           shiftState(state, code, attr.expression.concept === 'CallLogic' ? extraParams : {}),
         );
         code += indent((state?.tabSize || 0) + 3);
@@ -1706,25 +1726,28 @@ export class ViewElement extends BaseNode {
       } else {
         code += indent((state?.tabSize || 0) + 3);
         code += `const __funcName = () => { return `;
-        code += attr.expression.toEmbeddedTS(shiftState(state, code));
+        code += yield* attr.expression.toEmbeddedTS(shiftState(state, code));
         code += '};\n';
         code += indent((state?.tabSize || 0) + 3);
         code += `type ${datasourceName} = nasl.ui.GetItemTypeFromDataSource<ReturnType<typeof __funcName>>;\n`;
         // code += `let current${levelIndex === 0 ? '' : levelIndex}: nasl.ui.${currentType}<nasl.ui.GetItemTypeFromDataSource<ReturnType<typeof __funcName>>>;\n`;
       }
+    } else {
+      (self as any).__tsVariableDataSourceTypeName = 'any';
     }
     code += indent((state?.tabSize || 0) + 3);
     code += `return {\n`;
-    if (Array.isArray(this.bindAttrs)) {
-      this.bindAttrs
-        .filter((attr) => PAGE_COMPONENT_INCLUDE_TAG_MAP[this.tag]?.[attr.name])
-        .forEach((attr) => {
-          code += attr.toEmbeddedTSVariableFunctionDefinition(shiftState(state, code, { inline: true }));
-        });
+    if (Array.isArray(self.bindAttrs)) {
+      yield* wrapForEach(
+        self.bindAttrs.filter((attr) => PAGE_COMPONENT_INCLUDE_TAG_MAP[self.tag]?.[attr.name]),
+        function* warpForEachGenerator(attr) {
+          code += yield* attr.toEmbeddedTSVariableFunctionDefinition(shiftState(state, code, { inline: true }));
+        },
+      );
     }
-    if (Array.isArray(this.children)) {
-      this.children.forEach((element) => {
-        code += element.toEmbeddedTSVariableFunctionDefinition(
+    if (Array.isArray(self.children)) {
+      yield* wrapForEach(self.children, function* warpForEachGenerator(element) {
+        code += yield* element.toEmbeddedTSVariableFunctionDefinition(
           shiftState({ ...state, tabSize: state.tabSize + 2 }, code),
           levelIndex,
         );
@@ -1772,9 +1795,9 @@ export class ViewElement extends BaseNode {
     }
     return code;
   }
-  getDatasourceTypeCodeStr(state?: TranslatorState, eleArr?: Array<ViewElement>): string {
+  *getDatasourceTypeCodeStr(state?: TranslatorState, eleArr?: Array<ViewElement>) {
     let code = '';
-    (eleArr || []).forEach((element, index) => {
+    yield* wrapForEach(eleArr ?? [], function* wrapForEach(element, index) {
       const bindAttrs = element.bindAttrs;
       if (bindAttrs && bindAttrs.length) {
         const attr = bindAttrs.find((item) => item.name === 'data-source');
@@ -1791,14 +1814,14 @@ export class ViewElement extends BaseNode {
               inline: true,
               noNeedParams: true,
             };
-            let value = attr.expression.toEmbeddedTS(
+            let value = yield* attr.expression.toEmbeddedTS(
               shiftState(state, code, attr.expression.concept === 'CallLogic' ? extraParams : {}),
             );
             code += `type ${datasourceName} = `;
             code += `nasl.ui.GetItemTypeFromDataSource<typeof ${value}>;\n`;
           } else {
             code += `const __funcName${index} = () => { return`;
-            code += attr.expression.toEmbeddedTS(shiftState(state, code));
+            code += yield* attr.expression.toEmbeddedTS(shiftState(state, code));
             code += '};\n';
             code += `type ${datasourceName} = `;
             code += `nasl.ui.GetItemTypeFromDataSource<ReturnType<typeof __funcName${index}>>;\n`;
@@ -1810,10 +1833,10 @@ export class ViewElement extends BaseNode {
     code += indent((state?.tabSize || 0) + 2);
     return code;
   }
-  @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState, parentLevel?: number): string {
-    const { parentNode, app, tag, staticClass, name, bindDirectives, bindRoles, bindEvents, children } = this;
-
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState(), parentLevel?: number): TranslatorGenerator {
+    const self = this;
+    const { parentNode, app, tag, staticClass, name, bindDirectives, bindRoles, bindEvents, children } = self;
     const chineseTsName = (name: string) => {
       let tsName = name;
       // 匹配所有特殊字符都转为_
@@ -1823,7 +1846,6 @@ export class ViewElement extends BaseNode {
       }
       return tsName;
     };
-
     // 过滤模板的登录中的一些翻译，这里只过滤h5表格中的两个列
     if (
       (parentNode.concept === 'ViewElement' &&
@@ -1834,12 +1856,12 @@ export class ViewElement extends BaseNode {
       return '';
     }
     // pc事件翻译
-    if (this.toHump(tag) === 'lcapLogin') {
-      let code = `new nasl.ui.div({name: __elements.${this.name},\n`;
+    if (self.toHump(tag) === 'lcapLogin') {
+      let code = `new nasl.ui.div({name: __elements.${self.name},\n`;
       // 事件
-      if (Array.isArray(this.bindEvents)) {
-        this.bindEvents.forEach((event) => {
-          code += event.toEmbeddedTS(
+      if (Array.isArray(self.bindEvents)) {
+        yield* wrapForEach(self.bindEvents, function* warpForEachGenerator(event) {
+          code += yield* event.toEmbeddedTS(
             shiftState(state, code, {
               tabSize: (state?.tabSize || 0) + 2,
             }),
@@ -1847,20 +1869,19 @@ export class ViewElement extends BaseNode {
           code += '\n';
         });
       }
-
       code += `}),\n`;
       return code;
     }
     let levelIndex = parentLevel || 0;
-    if (tag === 'template' && this.haveScope()) {
-      const slotTarget = !this.slotTarget ? 'slotDefault' : 'slot' + this.toFirstUpper(this.toHump(this.slotTarget));
+    if (tag === 'template' && self.haveScope()) {
+      const slotTarget = !self.slotTarget ? 'slotDefault' : 'slot' + self.toFirstUpper(self.toHump(self.slotTarget));
       let code = '';
       code += `${slotTarget}: (current${levelIndex === 0 ? '' : levelIndex})=> {\n`;
-      code += this.getDatasourceTypeCodeStr(state, this.children);
+      code += yield* self.getDatasourceTypeCodeStr(state, self.children);
       levelIndex++;
       code += 'return [';
-      this.children.forEach((element) => {
-        code += element.toEmbeddedTS(
+      yield* wrapForEach(self.children, function* warpForEachGenerator(element) {
+        code += yield* element.toEmbeddedTS(
           shiftState(state, code, {
             tabSize: state?.tabSize || 0,
           }),
@@ -1872,13 +1893,13 @@ export class ViewElement extends BaseNode {
       code += '},\n';
       return code;
     } else if (tag === 'template') {
-      const slotTarget = !this.slotTarget ? 'slotDefault' : 'slot' + this.toFirstUpper(this.toHump(this.slotTarget));
+      const slotTarget = !self.slotTarget ? 'slotDefault' : 'slot' + self.toFirstUpper(self.toHump(self.slotTarget));
       let code = '';
       code += `${slotTarget}: ()=> {\n`;
-      code += this.getDatasourceTypeCodeStr(state, this.children);
+      code += yield* self.getDatasourceTypeCodeStr(state, self.children);
       code += 'return [';
-      this.children.forEach((element) => {
-        code += element.toEmbeddedTS(
+      yield* wrapForEach(self.children, function* warpForEachGenerator(element) {
+        code += yield* element.toEmbeddedTS(
           shiftState(state, code, {
             tabSize: state?.tabSize || 0,
           }),
@@ -1891,9 +1912,8 @@ export class ViewElement extends BaseNode {
       code += '},\n';
       return code;
     }
-
     // 后面那个name是为了查找引用的时候用的
-    let code = `new nasl.ui.${this.toHump(tag)}${this.getTypeArgmentsStr(state)}({name: __elements.${name},\n`;
+    let code = `new nasl.ui.${self.toHump(tag)}${self.getTypeArgmentsStr(state)}({name: __elements.${name},\n`;
     // 是否开启权限
     // const hasAuth = Array.isArray(bindDirectives)
     //     ? !!bindDirectives.filter((directive) => directive.name === 'auth').length
@@ -1902,7 +1922,7 @@ export class ViewElement extends BaseNode {
     if (Array.isArray(bindRoles) && bindRoles.length) {
       code += indent((state?.tabSize || 0) + 2);
       code += 'roles: [\n';
-      bindRoles.forEach((role) => {
+      yield* wrapForEach(bindRoles, function* warpForEachGenerator(role) {
         code += indent((state?.tabSize || 0) + 3);
         code += `${app.getNamespace()}.roles.${chineseTsName(role)}.${chineseTsName(role)},`;
         code += '\n';
@@ -1910,11 +1930,10 @@ export class ViewElement extends BaseNode {
       code += indent((state?.tabSize || 0) + 2);
       code += '],\n';
     }
-
     // 事件
     if (Array.isArray(bindEvents)) {
-      bindEvents.forEach((event) => {
-        code += event.toEmbeddedTS(
+      yield* wrapForEach(bindEvents, function* warpForEachGenerator(event) {
+        code += yield* event.toEmbeddedTS(
           shiftState(state, code, {
             tabSize: (state?.tabSize || 0) + 2,
           }),
@@ -1922,31 +1941,30 @@ export class ViewElement extends BaseNode {
         code += '\n';
       });
     }
-
     // 子元素
     if (Array.isArray(children)) {
       code += indent((state?.tabSize || 0) + 1);
-
-      if (Array.isArray(this.bindAttrs)) {
+      if (Array.isArray(self.bindAttrs)) {
         code += `bindAttr: () => [\n`;
-        this.bindAttrs.forEach((attr) => (code += attr.toEmbeddedTS(shiftState(state, code, { tabSize: 1 })) + ',\n'));
-        this.bindDirectives.forEach(
-          (directive) => (code += directive.toEmbeddedTS(shiftState(state, code, { tabSize: 1 })) + ',\n'),
-        );
-        this.bindStyles.forEach(
-          (bindStyle) => (code += bindStyle.toEmbeddedTS(shiftState(state, code, { tabSize: 1 })) + ',\n'),
-        );
+        yield* wrapForEach(self.bindAttrs, function* warpForEachGenerator(attr) {
+          code += (yield* attr.toEmbeddedTS(shiftState(state, code, { tabSize: 1 }))) + ',\n';
+        });
+        yield* wrapForEach(self.bindDirectives, function* warpForEachGenerator(directive) {
+          code += (yield* directive.toEmbeddedTS(shiftState(state, code, { tabSize: 1 }))) + ',\n';
+        });
+        yield* wrapForEach(self.bindStyles, function* warpForEachGenerator(bindStyle) {
+          code += (yield* bindStyle.toEmbeddedTS(shiftState(state, code, { tabSize: 1 }))) + ',\n';
+        });
         code += indent((state?.tabSize || 0) + 2) + '],\n';
       }
-
       // 如果子集中有插槽的就
       if (children.find((item) => item.tag === 'template' && item.slotTarget)) {
         code += indent((state?.tabSize || 0) + 2);
         const defaultArr: ViewElement[] = [];
         // 先把插槽翻译了
-        children.forEach((element) => {
+        yield* wrapForEach(children, function* warpForEachGenerator(element) {
           if (element.tag === 'template') {
-            code += element.toEmbeddedTS(
+            code += yield* element.toEmbeddedTS(
               shiftState(state, code, {
                 tabSize: state?.tabSize || 0,
               }),
@@ -1960,10 +1978,10 @@ export class ViewElement extends BaseNode {
         if (defaultArr.length) {
           code += indent((state?.tabSize || 0) + 2);
           code += `slotDefault: ()=> {\n`;
-          code += this.getDatasourceTypeCodeStr(state, defaultArr);
+          code += yield* self.getDatasourceTypeCodeStr(state, defaultArr);
           code += 'return [';
-          defaultArr.forEach((element) => {
-            code += element.toEmbeddedTS(
+          yield* wrapForEach(defaultArr, function* warpForEachGenerator(element) {
+            code += yield* element.toEmbeddedTS(
               shiftState(state, code, {
                 tabSize: (state?.tabSize || 0) + 2,
               }),
@@ -1979,10 +1997,10 @@ export class ViewElement extends BaseNode {
       } else {
         code += indent((state?.tabSize || 0) + 2);
         code += `slotDefault: ()=> {\n`;
-        code += this.getDatasourceTypeCodeStr(state, children);
+        code += yield* self.getDatasourceTypeCodeStr(state, children);
         code += 'return [';
-        children.forEach((element) => {
-          code += element.toEmbeddedTS(
+        yield* wrapForEach(children, function* warpForEachGenerator(element) {
+          code += yield* element.toEmbeddedTS(
             shiftState(state, code, {
               tabSize: (state?.tabSize || 0) + 2,
             }),
@@ -1996,16 +2014,13 @@ export class ViewElement extends BaseNode {
         code += '}\n';
       }
     }
-
     code += indent(state?.tabSize || 0) + '})';
-
     // 顶层元素是单独的表达式
     if (parentNode.concept === 'View') {
       code += ';\n';
     } else {
       code += ',\n';
     }
-
     return code;
   }
 
@@ -2590,6 +2605,12 @@ export class ViewElement extends BaseNode {
           }
         }
 
+        // key变化，让tableView重新渲染
+        if (['u-table-view'].includes(el.tag)) {
+          const time = new Date().getTime();
+          parts.push(`key="${el.name}_${time}"`);
+        }
+
         return parts;
       },
     });
@@ -2729,8 +2750,9 @@ export class ViewElement extends BaseNode {
           return;
         }
 
-        result && result !== 'undefined' && parts.push(result);
+        result && parts.push(result);
       });
+
     if (vIfs.length === 2) parts.push(`v-if="(${vIfs[0]}) && (${vIfs[1]})"`);
     else if (vIfs.length === 1) parts.push(`v-if="${vIfs[0]}"`);
 
@@ -2738,58 +2760,7 @@ export class ViewElement extends BaseNode {
     if (bindStyles) parts.push(bindStyles);
 
     newOptions.getExtraParts(this).forEach((part) => parts.push(part));
-    if (["u-number-input", 'van-stepper-new'].includes(this.tag)) {
-      // cloudUI
-      // :step="${step}" :decimalLength="${decimalLength}"
-      //  :decimal-places="{ places:${decimalLength}, omit:false }" //这个属性单独存在 需要测试
-      // vant
-      // step="${step}"  :decimal-length="${decimalLength}"
-      const checkAttr = (attrName: string) => {
-        let value = this.bindAttrs?.find(attr => attr?.name === attrName)?.value
-        return value && (value !== 'undefined')
-      }
-      let hasdecimalLength = (checkAttr("decimal-length") || checkAttr("decimalLength"))
-      let valueAttr = this.bindAttrs?.find(attr => attr?.name === "value")
-      const getNumberType = (attr: any) => {
-        let { typeName, typeNamespace } = attr?.expression?.__nodeType || {}
-        return typeName;
-      }
-      let numberType = getNumberType(valueAttr)
-      const pushDecimalLeng = (len: number, variableName?: string) => {
-        if (!(checkAttr("decimal-length") || checkAttr("decimalLength"))) {
-          // 值分 动态 非动态
-          //  1 有默认值 没有设置组件精度 ： 取默认值的length
-          // 2 无默认值无精度 取2
-          // 3 无默认值 有精度  取精度
-          if (variableName && variableName.length > 0) {
-            parts.push(`:decimal-length="${len}"`)
-            // parts.push(`:decimal-length="${variableName}.length"`)
-          } else {
-            parts.push(`:decimal-length="${len}"`)
-          }
-        }
-      };
-
-      if (!hasdecimalLength) {
-
-        if (valueAttr?.type === "dynamic" && numberType) {
-          if (numberType == 'Decimal') {
-            let variableName = ''
-            if (valueAttr?.expression) {
-              variableName = valueAttr?.expression?.name
-            }
-            pushDecimalLeng(2, variableName)
-            !checkAttr("step") && parts.push(`:step="0.01"`);
-          } else {
-            pushDecimalLeng(0)
-          }
-        } else {
-          pushDecimalLeng(0)
 
-        }
-      }
-      !checkAttr("highPrecision") && parts.push(`:highPrecision="true"`);
-    }
     if (['u-modal', 'u-drawer'].includes(this.tag)) {
       this.children.forEach((citem) => {
         if (citem.tag === 'template' && !citem.children.length) {
@@ -2802,7 +2773,8 @@ export class ViewElement extends BaseNode {
       this.name &&
       ['u-table-view', 'u-list-view', 'u-grid-view', 'u-list-components', 'u-form', 'u-select'].includes(this.tag)
     ) {
-      this.name && parts.push(`key="${this.name}"`);
+      const hasKey = parts.find((part)=>part && part.startsWith('key='));
+      !hasKey && this.name && parts.push(`key="${this.name}"`);
     }
 
     let partsLength = 0;