@lcap/nasl 2.20.1-beta.1 → 2.20.1-beta.3

package/src/service/storage/service.ts

@@ -4,7 +4,7 @@ import api from './api';
 const service = createService(api);
 
 export default {
-    batchQuery({ body, headers }: { body: Array<any>, headers: Record<string, string> }) {
+    batchQuery({ body, headers, config }: { body: Array<any>, headers: Record<string, string>, config?: object }) {
         const appData = (window as any).appData;
 
         return service.batchQuery({
@@ -15,6 +15,7 @@ export default {
                 'request-versionChangedTime': appData?.versionChangedTime || '',
                 operateArea: appData?.branchStatus === 'merging' ? 'merge_conflict' : '',
             }, headers),
+            config,
         });
     },
     batchAction({ body, headers }: { body: Array<any>, headers: Record<string, string> }) {
@@ -30,4 +31,31 @@ export default {
             }, headers),
         });
     },
+    batchInstruct({ body, headers }: { body: Array<any>, headers: Record<string, string> }) {
+        const appData = (window as any).appData;
+
+        return service.batchInstruct({
+            body,
+            headers: Object.assign({
+                appId: appData?.appId,
+                'request-appBaseVersion': (window as any).appData?.baseVersion || '',
+                'request-versionChangedTime': (window as any).appData?.versionChangedTime || '',
+                operateArea: (window as any).appData?.branchStatus === 'merging' ? 'merge_conflict' : '',
+            }, headers),
+            config: {
+                timeout: 1000 * 60,
+            },
+        });
+    },
+    saveFrontendNasl({ body }: { body: any }) {
+        const appData = (window as any).appData;
+        
+        return service.saveFrontendNasl({ 
+            body,
+            headers: {
+                appId: appData?.appId,
+                skipVersionCheck: true,
+            },
+         });
+    }
 };

package/src/templator/genCreateBlock.ts

@@ -49,7 +49,7 @@ export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
                         const selectNameGroup = selectNameGroupMap.get(key);
                         formItem += `
                         <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.viewLogicLoad}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" v-model="${vModel}">
+                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
                         </u-select>
                     `;
                     } else

package/src/templator/genCurdEditMultipleKeyBlock.ts

@@ -31,7 +31,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
 
     return `
 <u-linear-layout justify="space-between">
-    <u-form layout="inline" label-size="auto">
+    <u-form layout="inline">
     ${properties
         .map((property) => {
             const vModel = `${nameGroup.viewVariableFilter}.${property.name}`;
@@ -53,7 +53,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
                         const selectNameGroup = selectNameGroupMap.get(key);
                         formItem += `
                         <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.viewLogicLoad}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" v-model="${vModel}">
+                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
                         </u-select>
                     `;
                     } else
@@ -97,7 +97,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
         })
         .join('')}
 
-        <u-form-item layout="center">
+        <u-form-item layout="center" label-size="auto">
             <u-button color="primary" @click="${nameGroup.viewLogicReload}">查询</u-button>
         </u-form-item>
     </u-form>
@@ -152,7 +152,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
                         const selectNameGroup = selectNameGroupMap.get(key);
                         formItem += `
                         <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.load}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" v-model="${vModel}">
+                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
                         </u-select>
                     `;
                     } else

package/src/templator/genCurdMultipleKeyBlock.ts

@@ -22,7 +22,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
     const properties = entity.properties.filter(filterProperty('inFilter'));
     return `
 <u-linear-layout justify="space-between">
-    <u-form layout="inline" label-size="auto">
+    <u-form layout="inline">
     ${properties
         .map((property) => {
             const vModel = `${nameGroup.viewVariableFilter}.${property.name}`;
@@ -47,7 +47,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
                         const selectNameGroup = selectNameGroupMap.get(key);
                         formItem += `
                         <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.viewLogicLoad}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" v-model="${vModel}">
+                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
                         </u-select>
                     `;
                     } else
@@ -91,7 +91,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
         })
         .join('')}
 
-        <u-form-item layout="center">
+        <u-form-item layout="center" label-size="auto">
             <u-button color="primary" @click="${nameGroup.viewLogicReload}">查询</u-button>
         </u-form-item>
     </u-form>
@@ -148,8 +148,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
                             text-field="${lowerEntityName}.${displayedProperty.name}"
                             value-field="${lowerEntityName}.${relationProperty.name}"
                             :data-source="${selectNameGroup.viewLogicLoad}"
-                            :pageable="true"
-                            :remote-paging="true"
+                            :pagination="true"
                             ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}
                             v-model="${vModel}">
                         </u-select>

package/src/templator/genEditTableBlock.ts

@@ -49,7 +49,7 @@ export function genEditTableColumnTemplate(entity: Entity, property: EntityPrope
                     formItem += `
                         <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.viewLogicLoad}"
                             :autofocus="true" :opened="true" append-to="body" @blur="${nameGroup.viewLogicBlurUpdate}" @select="${nameGroup.viewLogicBlurUpdate}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" :value.sync="${valueExpression}">
+                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" :value.sync="${valueExpression}">
                         </u-select>
                     `;
                 } else
@@ -111,7 +111,7 @@ export function genEditTableTemplate(entity: Entity, nameGroup: NameGroup, selec
 
     return `<u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
         value-field="${nameGroup.viewVariableEntity}.id"
-        :pageable="true" :remote-paging="true" :show-sizer="true" :default-column-width="300" editable>
+        :pagination="true" :show-sizer="true" :default-column-width="300" editable>
     <u-table-view-column type="index" width="60"><template #title><u-text text="序号"></u-text></template><template #cell="current"></template></u-table-view-column>
 
     ${properties.map((property) => genEditTableColumnTemplate(entity, property, nameGroup, selectNameGroupMap) + '\n').join('')}

package/src/templator/genSelectBlock.ts

@@ -16,7 +16,7 @@ import {
 export function genSelectTemplate(property: EntityProperty, nameGroup: NameGroup) {
     return `<u-select clearable placeholder="请选择" ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
     text-field="${nameGroup.lowerEntity}.${property.name}"
-    value-field="${nameGroup.lowerEntity}.id" :pageable="true" :remote-paging="true">
+    value-field="${nameGroup.lowerEntity}.id" :pagination="true">
 </u-select>`;
 }
 

package/src/templator/genTableBlock.ts

@@ -63,7 +63,7 @@ export function genTableTemplate(entity: Entity, nameGroup: NameGroup, modifyabl
 
     return `<u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
         value-field="${nameGroup.viewVariableEntity}.id"
-        :pageable="true" :remote-paging="true" :show-sizer="true">
+        :pagination="true" :show-sizer="true">
     <u-table-view-column type="index" width="60"><template #title><u-text text="序号"></u-text></template><template #cell="current"></template></u-table-view-column>
 
     ${properties.map((property) => genTableColumnTemplate(property, currentName) + '\n').join('')}
@@ -258,7 +258,7 @@ export function genTableColumnBlock(property: EntityProperty, oldNode: ViewEleme
 
     return `
 <template>
-    <u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" :pageable="true" :remote-paging="true" :show-sizer="true" data-schema="${nameGroup.structure}">
+    <u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" :pagination="true" :show-sizer="true" data-schema="${nameGroup.structure}">
         ${properties.map((property) => genTableColumnTemplate(property) + '\n').join('')}
     </u-table-view>
 </template>

package/src/templator/genUpdateBlock.ts

@@ -49,7 +49,7 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
                         const selectNameGroup = selectNameGroupMap.get(key);
                         formItem += `
                         <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.viewLogicLoad}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" v-model="${vModel}">
+                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
                         </u-select>
                     `;
                     } else

package/src/translator/index.ts

@@ -89,7 +89,9 @@ export function withSourceMap() {
         descriptor.value = function (this: BaseNode, state?: TranslatorState, ...args: any[]) {
             // 重新生成ts代码就先把类型清除掉
             // 注意排查错误的时候，调用了这个方法，就会把节点上缓存的__TypeAnnotation清除
-            this.__isCorrectTypeAnnotation = false;
+            try {
+                this.__isCorrectTypeAnnotation = false;
+            } catch (err) {}
             if (!state) {
                 // 没有状态不生成 SourceMap
                 return oldMethod.call(this);