@lcap/nasl 3.3.0-beta.0 → 3.4.0-alpha.1

package/src/server/translator.ts

@@ -551,7 +551,7 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
     } else if (node.parentNode instanceof Assignment) {
       // OQL 的返回类型报错需要转换翻译，其内部 SQL 语句的参数类型报错不转换翻译
       if (node instanceof OqlQueryComponent) {
-        if (node.getCurrentSource().currentSource.start.line + 1 === tsErrorDetail.originalDiagnostic.start.line) {
+        if (node.getCurrentSource().currentSource.range.start.line + 1 === tsErrorDetail.originalDiagnostic.start.line) {
           tsErrorDetail.message = tsErrorDetail.message
             .replace('参数类型不一致！传入类型：', '赋值：类型不一致！右边类型：')
             .replace('接收类型：', '左边类型：');
@@ -801,6 +801,8 @@ export function checkAStructure_(errorText: string) {
       cap.splice(1, 1);
     }
     if (
+      ((cap[1].startsWith('{') && cap[1].endsWith('}')) || (cap[1].startsWith('{') && cap[1].endsWith('...'))) &&
+      ((cap[2].startsWith('{') && cap[2].endsWith('}')) || (cap[2].startsWith('{') && cap[2].endsWith('...'))) &&
       cap[1].includes('__name: "AStructure_') &&
       cap[2].includes('__name: "AStructure_')
     ) {

package/src/service/creator/add.configs.js

@@ -1,6 +1,5 @@
-
 import errHandles from './errHandles';
-import cookie from '../../utils/cookie'
+
 const isPromise = function (func) {
     return func && typeof func.then === 'function';
 };
@@ -23,30 +22,6 @@ function httpCode(response, params, requestInfo) {
 }
 
 function shortResponse(response, params, requestInfo) {
-    try {
-        if (globalThis?.document) {
-            const authorization = cookie.get('authorization')
-            const newAuthorization = response.headers?.authorization
-            if (newAuthorization && newAuthorization !== authorization) {
-                cookie.set({ authorization: newAuthorization })
-            }
-            const refreshToken = localStorage.getItem('refreshtoken')
-            const newRefreshToken = response.headers?.refreshtoken
-            if (newRefreshToken && newRefreshToken !== refreshToken) {
-                localStorage.setItem('refreshtoken', newRefreshToken)
-            }
-            if (response?.headers?.['max-age']) {
-                let maxAge = Number(response?.headers?.['max-age'] || 0)
-                if (maxAge > 200) {
-                    maxAge -= 200
-                }
-                const expiredTime = Date.parse(new Date()) / 1000 + maxAge
-                localStorage.setItem('authorizationExpiredRefreshTime', expiredTime)
-            }
-        }
-    } catch (err) {
-        console.warn(err)
-    }
     if(params === false)
         return response;
 

package/src/service/creator/errHandles.js

@@ -21,15 +21,14 @@ const versionStatus = {
     401013: 'version_inconsistent',
 };
 
+const FRONT_HANDLE_ERROR_MSG_CODE_LIST = [402201, 401356];
+
 export default {
     defaults({ config }, err = {}) {
         if (config.noErrorTip)
             return;
-        if (config?.noErrorCodeList?.includes(err.code)) {
-            return;
-        }
-        // 检测到租户正在降级中的错误跳转到提示页面，不报toast
-        if (err.code === 401809) {
+        // 检测到数组内错误码的情况下，由前端处理返回错误信息，不反显后端错误信息
+        if (FRONT_HANDLE_ERROR_MSG_CODE_LIST.includes(err.code)) {
             return;
         }
         // 检测到当前应用拉取操作已被强制结束

package/src/service/creator/index.js

@@ -18,18 +18,6 @@ const requester = function (requestInfo) {
     const { path, method, body = {}, headers = {}, query = {} } = url;
     let baseURL = config.baseURL || '';
     headers['Content-Type'] = headers['Content-Type'] || 'application/json';
-    try {
-        const refreshToken = localStorage.getItem('refreshtoken')
-        headers['refreshtoken'] = refreshToken;
-        const authorizationExpiredRefreshTime = localStorage.getItem('authorizationExpiredRefreshTime')
-        if (refreshToken && authorizationExpiredRefreshTime) {
-            if (Date.parse(new Date()) / 1000 >= Number(authorizationExpiredRefreshTime)) {
-                headers['refreshtoken'] = refreshToken;
-            }
-        }
-    } catch (err) {
-        console.warn(err)
-    }
     if (headers.operationDesc)
         headers.operationDesc = encodeURIComponent(headers.operationDesc);
 

package/src/service/storage/init.ts

@@ -127,6 +127,22 @@ function getMiniAppChange(target: any, obj: any, action: string) {
   }
 }
 
+let aiExecuted = 0;
+let sessionPath = '';
+// AI 生成内容是否被采纳
+const handleAIPoint = (app: any, actionItem: any) => {
+  const { actionMsg, action } = actionItem || {};
+  if (aiExecuted > 0) {
+    app.emit('logic:accepted', { ...actionItem, sessionPath });
+    aiExecuted -= 1;
+  }
+  if (actionMsg.includes('自然语言生成代码') && !action) {
+    aiExecuted += 1;
+    // eslint-disable-next-line prefer-destructuring
+    sessionPath = actionMsg.match(/:(.*)/)[1];
+  }
+}
+
 /**
  *  执行更新
  */
@@ -135,6 +151,7 @@ async function doAction(app: any, actionItem: any) {
   let hasBackEnd = false;
   const actionList: any[] = [];
   const { list, actionMsg, action } = actionItem || {};
+  handleAIPoint(app, actionItem);
   const itemloop = (_i: LogicItem, app: any, diffArr: string[]) => {
     const _l = getStatement(_i, app, diffArr);
     if (_l.length) {

package/src/service/storage/jsoner.ts

@@ -19,7 +19,7 @@ export interface Action {
 }
 
 function excludeProperties(node: any, excludes: string[]) {
-    const newNode = { ...node?.toJSON?.() ?? node };
+    const newNode = { ...node };
     if (Array.isArray(excludes) && excludes.length) {
         excludes.forEach((exclude) => {
             delete newNode[exclude];

package/src/templator/genCurdEditMultipleKeyBlock.ts

@@ -35,7 +35,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
     ${properties
       .map((property) => {
         const vModel = `${nameGroup.viewVariableFilter}.${property.name}`;
-        const label = (property.label || property.name).replace(/"/g, '"');
+        const label = property.label || property.name;
         let formItem = `<u-form-item layout="center"><template #label><u-text text="${label}"></u-text></template>`;
 
         const { typeAnnotation } = property || {};
@@ -127,7 +127,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
     ${properties
       .map((property) => {
         const vModel = `${nameGroup.viewVariableInput}.${property.name}`;
-        const label = (property.label || property.name).replace(/"/g, '&quot;');
+        const label = property.label || property.name;
         const required = !!property.required;
         const rules = [];
         if (property.rules && property.rules.length) {
@@ -405,7 +405,7 @@ export function genEditTableColumnComponent(app: App, entity: Entity, property:
   const newLoadSelectLogics: any[] = [];
 
   const genEditComponent = (property: EntityProperty) => {
-    const label = (property.label || property.name).replace(/"/g, '&quot;');
+    const label = property.label || property.name;
     let formItem = '';
 
     const propertyTypeName = property.typeAnnotation.typeName;

package/src/templator/genCurdMultipleKeyBlock.ts

@@ -34,7 +34,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
     ${properties
       .map((property) => {
         const vModel = `${nameGroup.viewVariableFilter}.${property.name}`;
-        const label = (property.label || property.name).replace(/"/g, '"');
+        const label = property.label || property.name;
         let formItem = `<u-form-item layout="center"><template #label><u-text text="${label}"></u-text></template>`;
 
         const { typeAnnotation } = property || {};
@@ -127,7 +127,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
     ${properties
       .map((property) => {
         const vModel = `${nameGroup.viewVariableInput}.${property.name}`;
-        const label = (property.label || property.name).replace(/"/g, '&quot;');
+        const label = property.label || property.name;
         const required = !!property.required;
         const rules = [];
         if (property.rules && property.rules.length) {
@@ -636,7 +636,7 @@ export function genGridViewMultipleKeyBlock(entity: Entity, oldNode: ViewElement
   return `<template>
     <u-linear-layout direction="vertical">
         ${genFilterTemplate(entity, nameGroup, selectNameGroupMap)}
-        ${genGridViewTemplate(entity, nameGroup, entityLogic, true, 'genCurdMultipleKeyBlock')}
+        ${genTableTemplate(entity, nameGroup, entityLogic, true, 'genCurdMultipleKeyBlock')}
         ${genSaveModalTemplate(entity, nameGroup, selectNameGroupMap)}
     </u-linear-layout>
 </template>

package/src/templator/genTableBlock.ts

@@ -22,7 +22,7 @@ export function genTableColumnTemplate(property: EntityProperty, currentName: st
   const dataSource = entity.parentNode as DataSource;
   const lowerEntityName = utils.firstLowerCase(entity.name);
   let valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
-  const title = (property.label || property.name).replace(/"/g, '"');
+  const title = property.label || property.name;
 
   if (property.relationEntity) {
     const relationLowerEntityName = utils.firstLowerCase(property.relationEntity);