@lcap/nasl 0.3.12-beta.2 → 0.3.13-beta

package/src/types/data/systemTypes.ts

@@ -24,6 +24,7 @@ export const systemTypeList = [
     { kind: 'systemType', text: 'UploadErrorEvent', value: '#/systemTypes/UploadErrorEvent' },
     { kind: 'systemType', text: 'SortEvent', value: '#/systemTypes/SortEvent' },
     { kind: 'systemType', text: 'PoiInfo', value: '#/systemTypes/PoiInfo' },
+    { kind: 'systemType', text: 'File', value: '#/systemTypes/File' },
 ];
 
 export const systemTypeMap: { [name: string]: ObjectSchema } = {
@@ -417,6 +418,27 @@ export const systemTypeMap: { [name: string]: ObjectSchema } = {
                 description: '选择项相关对象',
                 isLeaf: true,
             },
+            {
+                type: 'genericType',
+                typeKey: '#/genericTypes/List',
+                typeInstantiation: {
+                    typeName: 'List',
+                    typeParams: [
+                        {
+                            type: 'typeParam',
+                            typeParamName: 'T',
+                            typeParamValue: {
+                                typeKey: '#/basicTypes/String',
+                                type: 'string',
+                                format: '',
+                            },
+                        },
+                    ],
+                },
+                name: 'items',
+                description: '所有选中项相关对象的数组',
+                isLeaf: true,
+            },
             {
                 typeKey: '#/basicTypes/String',
                 type: 'string',
@@ -1311,6 +1333,27 @@ export const systemTypeMap: { [name: string]: ObjectSchema } = {
                 description: '选择项相关对象',
                 isLeaf: true,
             },
+            {
+                type: 'genericType',
+                typeKey: '#/genericTypes/List',
+                typeInstantiation: {
+                    typeName: 'List',
+                    typeParams: [
+                        {
+                            type: 'typeParam',
+                            typeParamName: 'T',
+                            typeParamValue: {
+                                typeKey: '#/basicTypes/String',
+                                type: 'string',
+                                format: '',
+                            },
+                        },
+                    ],
+                },
+                name: 'items',
+                description: '所有选中项相关对象的数组',
+                isLeaf: true,
+            },
         ],
     },
     '#/systemTypes/UploadEvent': {
@@ -1559,4 +1602,34 @@ export const systemTypeMap: { [name: string]: ObjectSchema } = {
             },
         ],
     },
+    '#/systemTypes/File': {
+        name: 'File',
+        type: 'object',
+        propertyList: [
+            {
+                typeKey: '#/basicTypes/String',
+                type: 'string',
+                format: '',
+                name: 'name',
+                description: '文件名称',
+                isLeaf: true,
+            },
+            {
+                typeKey: '#/basicTypes/Integer',
+                type: 'integer',
+                format: 'int',
+                name: 'size',
+                description: '文件大小',
+                isLeaf: true,
+            },
+            {
+                typeKey: '#/basicTypes/String',
+                type: 'string',
+                format: '',
+                name: 'type',
+                description: '文件类型',
+                isLeaf: true,
+            },
+        ],
+    },
 };

package/src/types/logic/translator.js

@@ -608,7 +608,7 @@ export default function (source) {
                 if (node.calleeCode === 'Split') {
                     // Bug-34789: 参考 url 转义规则对 ' 转义
                     // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/encodeURIComponent
-                    params = params.map((param) => (param.replace(/(?<=').*(?=')/, (s) => s.replace(/'/g, '%27'))));
+                    params = params.map((param) => (param.replace(/'(.*)'/, (match, p1) => `'${p1.replace(/'/g, '%27')}'`)));
                     if (params.find((param) => param.includes('%27')))
                         return `this.$utils['${node.calleeCode}'](${params.join(',')}).map((item) => item.replace(/%27/g, "'"))`;
                 }

package/src/types/page/Page.ts

@@ -107,6 +107,9 @@ export class Page extends Vertex {
             path: {
                 id: this.id,
             },
+            headers: {
+                'request-lcpAppId': this.service.appId,
+            },
         });
         this.assign(result);
 
@@ -174,6 +177,7 @@ export class Page extends Vertex {
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'Page.create',
                 operationDesc: actionOptions?.actionDesc || `添加页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
+                'request-lcpAppId': this.service.appId,
             },
             body,
         }).catch(catchFn());
@@ -233,6 +237,7 @@ export class Page extends Vertex {
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'Page.create',
                 operationDesc: actionOptions?.actionDesc || `添加页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
+                'request-lcpAppId': this.service.appId,
             },
             body,
         });
@@ -268,6 +273,7 @@ export class Page extends Vertex {
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'Page.delete',
                 operationDesc: actionOptions?.actionDesc || `删除页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
+                'request-lcpAppId': this.service.appId,
             },
             path: {
                 id: this.id,
@@ -295,6 +301,7 @@ export class Page extends Vertex {
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'Page.delete',
                 operationDesc: actionOptions?.actionDesc || `修改页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
+                'request-lcpAppId': this.service.appId,
             },
             body,
         }).catch(catchFn());

package/src/types/page/View.ts

@@ -189,6 +189,7 @@ export class View extends Block {
         if (this.contentPromise)
             return this.contentPromise;
 
+
         return this.contentPromise = (async () => {
             try {
                 const result: View = await viewService.load({
@@ -198,6 +199,9 @@ export class View extends Block {
                     query: {
                         enableCache,
                     },
+                    headers: {
+                        'request-lcpAppId': this.page.service.appId, // generator调用时需要appId headers
+                    },
                 });
 
                 const $def = result.$def;
@@ -237,6 +241,9 @@ export class View extends Block {
                     enableCache,
                 },
                 config: { noErrorTip: true },
+                headers: {
+                    'request-lcpAppId': this.page.service.appId,
+                },
             });
             const oldLogics = this.$def.logics;
             Object.assign(result, {
@@ -357,6 +364,9 @@ export class View extends Block {
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'View.create',
                 operationDesc: actionOptions?.actionDesc || `添加子页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
+                headers: {
+                    'request-lcpAppId': this.page.service.appId,
+                },
             },
             body,
         }).catch(catchFn());
@@ -411,6 +421,9 @@ export class View extends Block {
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'View.create',
                 operationDesc: actionOptions?.actionDesc || `添加子页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
+                headers: {
+                    'request-lcpAppId': this.page.service.appId,
+                },
             },
             body,
         });
@@ -445,6 +458,9 @@ export class View extends Block {
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'View.delete',
                 operationDesc: actionOptions?.actionDesc || `删除子页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
+                headers: {
+                    'request-lcpAppId': this.page.service.appId,
+                },
             },
             path: {
                 id: this.id,
@@ -479,6 +495,9 @@ export class View extends Block {
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'View.update',
                 operationDesc: actionOptions?.actionDesc || `修改子页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
+                headers: {
+                    'request-lcpAppId': this.page.service.appId,
+                },
             },
             body,
         }).catch(catchFn());
@@ -960,6 +979,9 @@ export class View extends Block {
                 appId: config.defaultApp?.id,
                 operationAction: 'View.mergeBlock',
                 operationDesc: '根据实体自动生成组件和逻辑',
+                headers: {
+                    'request-lcpAppId': this.page.service.appId,
+                },
             },
         });
 

package/src/types/typeCheck.ts

@@ -25,14 +25,19 @@ export default {
     push(record: TypeCheckRecord) {
         const pos = this.deleteOwn(record.id);
 
-        if(record.typeCheckNote?.message?.filter)
+        if (record.typeCheckNote?.message?.filter)
             record.typeCheckNote.message = record.typeCheckNote.message.filter((item) => !!item);
 
-        if(!record.typeCheckNote || record.typeCheckNote.status === 'success'
-            || (record.typeCheckNote && record.typeCheckNote.message && record.typeCheckNote.message.length === 0))
+        if (!record.typeCheckNote || record.typeCheckNote.status === 'success')
             return;
+        // typeCheckNote.message 不存在时，视为误报
+        if (record.typeCheckNote && record.typeCheckNote.status !== 'success'
+            && (!record.typeCheckNote.message || record.typeCheckNote.message.length === 0)) {
+            console.error('typeCheckNote 异常数据', record);
+            return;
+        }
 
-        if(pos === -1)
+        if (pos === -1)
             this.records.unshift(record);
         else
             this.records.splice(pos, 0, record);
@@ -106,4 +111,4 @@ export default {
             }
         }
     },
-};
+};