@lcap/nasl 3.7.3-beta.1 → 3.8.0-beta.2

package/src/generator/release-body/utils.ts

@@ -1,16 +1,19 @@
-import type {
-  App,
-  Role,
-  View,
-  ViewElement,
-  Frontend,
-  FrontendType,
-} from '../../concepts';
+import type { App, Role, View, ViewElement, Frontend, FrontendType } from '../../concepts';
 
 import { AxiosInstance } from 'axios';
 import * as asserts from '../../concepts/utils/asserts';
 import { ReleaseData, ReleaseMode } from './types';
-import { HttpData, VersionDetail, MaterialData, EnvData, TenantData, AppDetailData, Asset } from './internal';
+import {
+  HttpData,
+  VersionDetail,
+  MaterialData,
+  EnvData,
+  TenantData,
+  AppDetailData,
+  Asset,
+} from './internal';
+import { sliceTagContent } from '../../utils';
+import * as utils from '../../utils';
 
 /**
  * 权限上报数据
@@ -19,7 +22,12 @@ export function getAuthReport(app: App, frontends: Array<Frontend>) {
   const result = {
     roleList: [] as Array<Role>,
     resourceList: [] as Array<string>,
-    resourceDataList: [] as Array<{ value: string; description: string; type: 'page' | 'component' | 'logic'; clientType?: string }>,
+    resourceDataList: [] as Array<{
+      value: string;
+      description: string;
+      type: 'page' | 'component' | 'logic';
+      clientType?: string;
+    }>,
     roleResourceMappingList: [] as Array<{ roleName: string; resourcePath: string }>,
   };
 
@@ -96,7 +104,11 @@ export function findAllReportIdList(app: App, frontends: Array<Frontend>) {
   return [...new Set(reportIds)].filter(Boolean);
 }
 
-export function replaceAssetUrl(files: Array<{ name: string; content: string }>, oldUrlWithoutProtocol: string, newUrlWithProtocol: string) {
+export function replaceAssetUrl(
+  files: Array<{ name: string; content: string }>,
+  oldUrlWithoutProtocol: string,
+  newUrlWithProtocol: string
+) {
   const newUrlWithoutProtocol = newUrlWithProtocol.replace(/^https?:/, '');
   if (newUrlWithoutProtocol === oldUrlWithoutProtocol) return files;
 
@@ -105,14 +117,18 @@ export function replaceAssetUrl(files: Array<{ name: string; content: string }>,
   for (const file of files) {
     // 清除 query 参数
     file.content = file.content.replace(reg, (...args) => args[0].split('?')[0]);
-    file.content = file.content.replace(reg2, (whole, protocol) => (protocol ? newUrlWithProtocol : newUrlWithoutProtocol));
-    file.name = file.name.replace(reg2, (whole, protocol) => (protocol ? newUrlWithProtocol : newUrlWithoutProtocol));
+    file.content = file.content.replace(reg2, (whole, protocol) =>
+      protocol ? newUrlWithProtocol : newUrlWithoutProtocol
+    );
+    file.name = file.name.replace(reg2, (whole, protocol) =>
+      protocol ? newUrlWithProtocol : newUrlWithoutProtocol
+    );
   }
   return files;
 }
 
 export function getFrontendByTypes(frontendTypes: FrontendType[] = []) {
-  return (frontendTypes?.map((frontendType) => (frontendType?.frontends || [])) || []).flat(2);
+  return (frontendTypes?.map((frontendType) => frontendType?.frontends || []) || []).flat(2);
 }
 
 /**
@@ -152,7 +168,13 @@ export async function getUsedAssets(axios: AxiosInstance, id: string, frontends:
   return Array.from(assetSet);
 }
 
-export async function staticResourceSync(axios: AxiosInstance, assets: Array<Asset>, id: string, env: string, frontends: Frontend[]) {
+export async function staticResourceSync(
+  axios: AxiosInstance,
+  assets: Array<Asset>,
+  id: string,
+  env: string,
+  frontends: Frontend[]
+) {
   const urlNameMap: Record<string, string> = {};
   const assetSet = new Set<string>();
 
@@ -172,23 +194,31 @@ export async function staticResourceSync(axios: AxiosInstance, assets: Array<Ass
   // 发起资源同步请求，传递nasl使用到的资源名称
   const needSyncResourceNameList = Array.from(assetSet);
   const { data: res } = await axios.post(
-      '/api/v1/app/env/staticResourceSync',
-      {
-        needSyncResourceNameList,
-      },
-      {
-          params: {
-              appId: id,
-              env: env,
-          },
+    '/api/v1/app/env/staticResourceSync',
+    {
+      needSyncResourceNameList,
+    },
+    {
+      params: {
+        appId: id,
+        env: env,
       },
+    }
   );
 
   return (res as any).result.ossUrlPrefixExcludeProtocol;
 }
 
-export async function getPackageInfos(axios: AxiosInstance, app: App, dependencies: VersionDetail['dependencies'], staticUrl: string, fullVersion: string) {
-  const { data: materialCode } = await axios.get<string>(`${staticUrl}/packages/@lcap/mdd-ide@${fullVersion}/dist-mdd-ide/material.config.js`);
+export async function getPackageInfos(
+  axios: AxiosInstance,
+  app: App,
+  dependencies: VersionDetail['dependencies'],
+  staticUrl: string,
+  fullVersion: string
+) {
+  const { data: materialCode } = await axios.get<string>(
+    `${staticUrl}/packages/@lcap/mdd-ide@${fullVersion}/dist-mdd-ide/material.config.js`
+  );
   const window = {} as { LCAP_MATERIALS: MaterialData };
   eval(materialCode);
   return app.loadPackageInfos(window.LCAP_MATERIALS);
@@ -196,7 +226,17 @@ export async function getPackageInfos(axios: AxiosInstance, app: App, dependenci
 
 export async function getAppInfo(axios: AxiosInstance, releaseData: ReleaseData) {
   const { config } = releaseData;
-  const [{ data: { result: env } }, { data: { result: appData } }, { data: { result: tenant } }] = await Promise.all([
+  const [
+    {
+      data: { result: env },
+    },
+    {
+      data: { result: appData },
+    },
+    {
+      data: { result: tenant },
+    },
+  ] = await Promise.all([
     axios.get<HttpData<EnvData>>('/api/v1/env/config'),
     axios.get<HttpData<AppDetailData>>('/api/v1/lcpapp/getLcpAppByAppId', {
       params: {
@@ -221,7 +261,7 @@ export async function getAppInfo(axios: AxiosInstance, releaseData: ReleaseData)
     isPreviewFe: config.mode === ReleaseMode.ExportTemplate,
     realRelease: config.mode === ReleaseMode.Release,
     debug: config.debug,
-    STATIC_URL: isExport ? '' : (env.STATIC_URL || 'https://static-vusion.163yun.com'),
+    STATIC_URL: isExport ? '' : env.STATIC_URL || 'https://static-vusion.163yun.com',
     extendedConfig: appData?.extendedConfig,
     ...tenant,
   };
@@ -229,33 +269,41 @@ export async function getAppInfo(axios: AxiosInstance, releaseData: ReleaseData)
 
 export async function getVersionDetail(axios: AxiosInstance, app: any) {
   const sampleVersion = app.ideVersion as string;
-  const { data: versionData } = await axios.get<HttpData<VersionDetail>>(`/api/v1/ide/version/user/detail?version=${sampleVersion}`);
+  const { data: versionData } = await axios.get<HttpData<VersionDetail>>(
+    `/api/v1/ide/version/user/detail?version=${sampleVersion}`
+  );
   const fullVersion = versionData.result.version;
 
   return {
-      version: sampleVersion,
-      fullVersion: fullVersion,
-      dependencies: versionData.result.dependencies,
+    version: sampleVersion,
+    fullVersion: fullVersion,
+    dependencies: versionData.result.dependencies,
   };
 }
 
-export async function getValidationRules(axios: AxiosInstance, ideVersion: string, frontends: FrontendType[]) {
+export async function getValidationRules(
+  axios: AxiosInstance,
+  ideVersion: string,
+  frontends: FrontendType[]
+) {
   const formData = new FormData();
-  formData.append('file', new Blob([JSON.stringify(frontends.map((view) => view.toJSON()))], { type: 'application/json' }));
-  const validations = await axios({
+  formData.append(
+    'file',
+    new Blob([JSON.stringify(frontends.map((view) => view.toJSON()))], { type: 'application/json' })
+  );
+  const validations = await axios<HttpData>({
     method: 'post',
     url: `/api/v1/ide/nasl/frontend/call-logic/validations/batch`,
     headers: {
-        ideVersion: ideVersion,
-        'Content-Type': 'multipart/form-data',
+      ideVersion: ideVersion,
+      'Content-Type': 'multipart/form-data',
     },
     data: formData,
   }).catch((e) => e);
 
   if (!validations.data?.success) {
     return `获取服务端验证器配置失败：${validations.data?.msg ?? ''}`;
-  }
-  else {
+  } else {
     return validations.data.result;
   }
 }
@@ -295,6 +343,47 @@ export function getContentType(fileName: string) {
   }
 }
 
+/**
+ * 生成流程表单
+ * @param entity
+ * @param view
+ * @returns
+ * @description 生成流程表单代码，逻辑比较定制化，由于封闭形态下表单修改不容易同步更新审批页流程表单，所以流程页表单在预览生成时补充生成
+ */
+export function genProcessFormCode(view: View) {
+  const processV2 = view.getDestinationProcessV2();
+  let res = '';
+  if (!processV2?.composedBy) {
+    return res;
+  }
+
+  const entity = processV2.currentBindEntity,
+    nodes = view.app.getCompose(processV2.composedBy)?.nodes || [],
+    form = nodes.find((node) => node.name === node.composedBy[0]),
+    frontendType = view.frontend.type,
+    processName = processV2.name,
+    tagPrefix = frontendType === 'pc' ? 'u' : 'van';
+  // res = sliceTagContent(form.toVue(), `${tagPrefix}-form`);
+  // 定义正则表达式
+  const regex = frontendType === 'pc' ? /<u-form\b[^>]*>([\s\S]*?)<\/u-form>/i : /<van-form\b[^>]*>([\s\S]*?)<\/van-form>/i;
+
+  // 使用正则表达式匹配内容
+  const matches = regex.exec(form.toVue({filterAttr:['processHidden']}));
+
+  // 获取匹配到的内容
+  res = matches[1];
+  res = res.replaceAll(entity.name, `processDetailFormData.data`); // TODO: 这样替换可能有问题，需要进一步测试
+  if (frontendType === 'pc') {
+      // 删除最后的btns
+    let startIndex = res.lastIndexOf('<u-grid-layout-column');
+    let endIndex = res.lastIndexOf('</u-grid-layout-column>') + '</u-grid-layout-column>'.length;
+    res = res.substring(0, startIndex) + res.substring(endIndex);
+  } else {
+    res = res.replace(/<van-button[^>]*>.*<\/van-button>/g, '');
+  }
+  return res;
+}
+
 /**
  * 权限上报表单定义数据
  */
@@ -302,20 +391,19 @@ export function getProcessFormDefinitions(app: App) {
   let res: any = [];
   const processV2s = app?.processV2s || [];
   processV2s.forEach((process) => {
-
-    const itemPC: { keys: string[], content: string} = {
+    const itemPC: { keys: string[]; content: string } = {
       keys: [],
-      content:'',
+      content: '',
     };
 
-    const itemH5: { keys: string[], content: string} = {
+    const itemH5: { keys: string[]; content: string } = {
       keys: [],
-      content:'',
+      content: '',
     };
 
     process.elements.forEach((element) => {
       const attrPC = element?.bindAttrs.find((attr) => attr.name === 'destination-pc'),
-      attrH5 = element?.bindAttrs.find((attr) => attr.name === 'destination-m');
+        attrH5 = element?.bindAttrs.find((attr) => attr.name === 'destination-m');
 
       const patchKey = (attr: any, type: string, item: any) => {
         if (attr) {
@@ -327,19 +415,37 @@ export function getProcessFormDefinitions(app: App) {
             if (!item.content && form) {
               formDefinition = form.toVue();
               const processPrefix = form.getBindAttribute('processPrefix')?.value;
-              formDefinition = formDefinition.replaceAll(`${processPrefix}.`, 'processDetailFormData.');
-              formDefinition = formDefinition.replaceAll(`${process.name}.`, 'processDetailFormData.');
-              formDefinition = formDefinition.replace(/:ref="([^"]+)"/g, (match: any, p1: string) => {
-                // ref-name加上方便制品找表单
-                return `:ref="${p1}" ref-name="${p1.replace(/^`+|`+$/g, "")}" `;
-              });
-
+              formDefinition = formDefinition.replaceAll(
+                `${processPrefix}.`,
+                'processDetailFormData.'
+              );
+              formDefinition = formDefinition.replaceAll(
+                `${process.name}.`,
+                'processDetailFormData.'
+              );
+              formDefinition = formDefinition.replace(
+                /:ref="([^"]+)"/g,
+                (match: any, p1: string) => {
+                  // ref-name加上方便制品找表单
+                  return `:ref="${p1}" ref-name="${p1.replace(/^`+|`+$/g, '')}" `;
+                }
+              );
+
+              if (process?.composedBy) {
+                const formInfo = genProcessFormCode(view);
+                console.log('formInfo: ', formInfo);
+                // 往form内塞入内容
+                if (type === 'pc')
+                  formDefinition = formDefinition.replace(/<\/u-form>/, `${formInfo}</u-form>`);
+                else
+                  formDefinition = formDefinition.replace(/<\/van-form>/, `${formInfo}</van-form>`);
+              }
               item.content = formDefinition;
             }
             item.keys.push(key);
           }
         }
-      }
+      };
       attrPC && patchKey(attrPC, 'pc', itemPC);
       attrH5 && patchKey(attrH5, 'm', itemH5);
     });
@@ -351,9 +457,7 @@ export function getProcessFormDefinitions(app: App) {
     if (itemH5.keys.length && itemH5.content) {
       res.push(itemH5);
     }
-
   });
 
   return res;
 }
-

package/src/natural/genNaturalTS.ts

@@ -96,10 +96,8 @@ export function genNaturalTSContextForLogic(
     code += getFrontendViews(frontend, state, currentNode, true).code;
   }
 
-  if (focusedNodePath) {
-    code += '\n### 当前逻辑上下文\n';
-    code += getCurrentNodeContext(currentNode, focusedNodePath).code;
-  }
+  code += '\n### 当前逻辑上下文\n';
+  code += getCurrentNodeContext(currentNode, focusedNodePath).code;
   return code;
 }
 
@@ -251,4 +249,4 @@ export function genNaturalTSContextJSONForUI(
   };
 }
 
-export * as getNaturalContext from './getContext';
+export * as getNaturalContext from './getContext';

package/src/natural/getContext/index.ts

@@ -418,8 +418,6 @@ export function getFrontendViews(frontend: Frontend, state: TranslatorState, cur
       rename,
     });
     code += tempCode;
-    if (state.descriptionComment)
-      code += `/* ${description} */`;
     code += `\n`;
     data.push({ description, code: tempCode });
     const prefix = `${namespace}.${view?.name}_view`;

package/src/natural/transformTS2UI.ts

@@ -6,6 +6,7 @@ import * as babelTypes from '@babel/types';
 import generate from '@babel/generator';
 import * as naslTypes from '../concepts';
 import { genHash } from '../generator';
+import { type ParseResult } from '@babel/parser';
 
 const DEBUG = false;
 function throwError(message: string) {
@@ -1155,10 +1156,12 @@ function transformNode2ViewConstruct(node: babelTypes.Node): naslTypes.ViewEleme
   return null;
 }
 
+type ParseResultFile = ParseResult<babel.types.File>;
+
 /**
  * 转换Node为View
 */
-function transformNode2View(node: babelTypes.FunctionDeclaration, root?: babelTypes.File): { view: naslTypes.View, json: any; } {
+function transformNode2View(node: babelTypes.FunctionDeclaration, root?: ParseResultFile): { view: naslTypes.View, json: any; } {
   const parameters: babelTypes.Identifier[] = node.params as babelTypes.Identifier[];
   let statements: babelTypes.Statement[] = node.body.body;
   const currentPositionComment = root?.comments.find((comment) => comment.type === 'CommentLine' && comment.value === ' 当前页面');
@@ -1208,7 +1211,7 @@ const transformTS2View = (tsCode: string): any => {
   const root = babel.parseSync(tsCode, {
     filename: 'result.ts',
     presets: [require('@babel/preset-typescript')],
-  }) as babelTypes.File;
+  });
 
   let func: babelTypes.FunctionDeclaration;
   if (root.program?.body[0]?.type === 'ExportNamedDeclaration') {

package/src/natural/transformTSCode.ts

@@ -16,7 +16,7 @@ export function tryParseTS(tsCode: string) {
     const root = babel.parseSync(tsCode, {
       filename: 'result.ts',
       presets: [require('@babel/preset-typescript')],
-    }) as babelTypes.File;
+    });
     // console.log((root as any).program.body[0].body.body.map((item) => item.trailingComments));
     return root;
   } catch (e) {
@@ -970,7 +970,7 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
   const root = babel.parseSync(tsCode, {
     filename: 'result.ts',
     presets: [require('@babel/preset-typescript')],
-  }) as babelTypes.File;
+  });
 
   let parameters: babelTypes.Identifier[] = [];
   let statements: babelTypes.Statement[] = [];

package/src/server/extendBaseNode.ts

@@ -29,13 +29,14 @@ import {
   ProcessV2,
   ProcessBindV2,
   FieldPermissionV2,
+  Argument,
 } from '../concepts';
 import { FileNode, traverse } from '../utils';
 import { EventPayload, invokeCommand, registerCommand } from '../common';
 import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
 
 import { extendSentryMonitorNaslNode } from '../sentry';
-import { isAuthLogicForCallInterface, isParam } from '../concepts/utils/asserts';
+import { isAuthLogicForCallInterface, isParam, isSubLogic } from '../concepts/utils/asserts';
 
 interface SetNameNode extends BaseNode {
   setName(name: string): any;
@@ -613,7 +614,14 @@ BaseNode.prototype.prepareDelete = async function prepareDelete(cb?: Function) {
           );
           this.delete();
           (this as any).app.emit('collect:end');
-        } else {
+        } else if (isSubLogic(node)) {
+          (this as any).app.emit('collect:start', {
+            actionMsg: `删除子逻辑`,
+          });
+          (this?.parentNode as Argument).resetExpression();
+          // this.delete();
+          (this as any).app.emit('collect:end');
+        }else {
           this.delete();
         }
       };
@@ -875,6 +883,7 @@ BaseNode.prototype.addParamsPrepare = async function addParamsPrepare(needAdd =
     const app = this.getAncestor('App');
     const naslServer = (app as any).naslServer as NaslServer;
     const refsList = await naslServer._isHaveRef(this);
+    console.log('------------addParamsPrepare------------', refsList, needAdd)
     return naslServer._addParamsPrepare(this, refsList, needAdd);
   } catch (err) {
     console.log(err);

package/src/server/getLogics.ts

@@ -188,9 +188,9 @@ export function getLogicsSync(node: CallLogic | BindEvent | Identifier | Logic,
       // 连接器 相关迁移到了 conenctorDependencies 下，因此这边需要扩展
       const dependencies = [
         ...app.dependencies,
-        ...(app.connectorDependencies || [])
+        // ...(app.connectorDependencies || [])
       ]; //.filter((d) => d.enable);
-      const extensions = [...app.dependencies, ...(app.connectorDependencies || [])]
+      const extensions = [...app.dependencies]
         .map((dep) => moduleToLogicNamesapce(dep, app.overriddenLogics))
         .filter((item) => item.logics && item.logics.length);
       const dependEntityNs: Namespace[] = [];
@@ -279,7 +279,7 @@ export function getLogicsSync(node: CallLogic | BindEvent | Identifier | Logic,
         new Namespace({
           name: 'category',
           title: '流程处理',
-          logics: processV2Logics.filter((logic) => ['approveTask', 'rejectTask', 'submitTask', 'reassignTask', 'revertTask', 'withdrawTask', 'terminateProcess'].includes(logic.name)),
+          logics: processV2Logics.filter((logic) => ['approveTask', 'rejectTask', 'submitTask', 'reassignTask', 'revertTask', 'withdrawTask', 'addSignTask', 'terminateProcess'].includes(logic.name)),
           expanded: false,
         }),
         new Namespace({
@@ -328,7 +328,7 @@ export function getLogicsSync(node: CallLogic | BindEvent | Identifier | Logic,
         path: `nasl`,
         title: '系统逻辑',
         children: [
-          processLogicsTree,
+          currentProcessLogics,
           new Namespace({
             name: 'category',
             path: `browser`,
@@ -463,14 +463,15 @@ export function getLogicsSync(node: CallLogic | BindEvent | Identifier | Logic,
               name: 'category',
               path: 'dependencies',
               title: item.name,
-              logics: fed.logics,
+              logics: fed.logics as unknown as Logic[], // FIXME
               expanded: false,
             })
           );
         }
       });
 
-      if (!app.processes.length) systemTree.children.shift();
+      if (!app.processes.length && !app.newProcessVersion) systemTree.children.shift();
+      else if (!app.processV2s.length && app.newProcessVersion) systemTree.children.shift();
 
       systemTree.expanded = false;
       systemTree.children.forEach((child) => (child.expanded = false));
@@ -500,7 +501,8 @@ export function getLogicsSync(node: CallLogic | BindEvent | Identifier | Logic,
         ],
         expanded: false,
       });
-      if (!(app.processes?.length) && !(app.processV2s?.length)) systemTree.children.shift();
+      if (!app.processes.length && !app.newProcessVersion) systemTree.children.shift();
+      else if (!app.processV2s.length && app.newProcessVersion) systemTree.children.shift();
 
       systemTree.expanded = false;
       systemTree.children.forEach((child) => (child.expanded = false));

package/src/server/getMemberIdentifier.ts

@@ -17,6 +17,7 @@ import {
   PAGE_COMPONENT_INCLUDE_TAG_MAP,
   ComponentCompletionPropertyMap,
   configurationEnums,
+  processV2Enums,
 } from '..';
 import { formatVariableData, formatFrontEndVariables, formatConfigProperties, formatBackendVariables } from './formatTsUtils';
 
@@ -306,6 +307,12 @@ export function getEnumsIdentifier(node: BaseNode): CompletionProperty[] {
     concept: 'category',
     children: formatEnums(configurationEnums),
   });
+  // 增加流程枚举
+  extensionEnums.push({
+    name: '流程',
+    concept: 'category',
+    children: formatEnums(processV2Enums),
+  });
   return newEnums.concat(extensionEnums);
 }
 // 获取后端全局变量

package/src/server/getProcessesV2.ts

@@ -21,6 +21,7 @@ type CompletionData = {
   name: string;
   concept: string;
   value: string;
+  rootName: string;
   selectable?: boolean;
   children: Array<any>;
 };
@@ -153,6 +154,7 @@ export function getProcessSystemVariables(processEle: ProcessElementV2) {
   const startNode = {
     name: processV2.name,
     value: processV2.name,
+    title: processV2.name,
     expanded: true,
     icon: 'process',
     children: transformIdentifier([{ value: '流程实例发起人', name: 'processSystem.procInstStartBy' }]),
@@ -160,11 +162,12 @@ export function getProcessSystemVariables(processEle: ProcessElementV2) {
   const prefixNode: any = {
     name: '上一任务节点',
     value: '上一任务节点',
+    title: '上一任务节点',
     expanded: true,
     icon: 'ApprovalTask',
     children: transformIdentifier([
-      { value: '上一节点(审批)参与人', name: 'processSystem.pre.nodeParticipants' },
-      { value: '上一节点(审批)完成人', name: 'processSystem.pre.nodeAssignees' },
+      { value: '节点参与人', name: 'processSystem.pre.nodeParticipants' },
+      { value: '节点完成人', name: 'processSystem.pre.nodeAssignees' },
     ]),
   }
   const elements: ProcessElementV2[] = getPreviousTask(processEle);
@@ -172,6 +175,7 @@ export function getProcessSystemVariables(processEle: ProcessElementV2) {
     return {
       name: item.name,
       value: item.name,
+      title: item.title,
       expanded: true,
       icon: item.type,
       isProcess: true,
@@ -185,6 +189,9 @@ export function getProcessSystemVariables(processEle: ProcessElementV2) {
 
   const { properties = [] } = processV2.currentBindEntity || {};
   let customs: EntityProperty[] | MemberExpression[] = properties.filter(({ typeAnnotation }) => ['String', 'List<String>'].includes(typeAnnotation?.sign))
+  if(processV2.composedBy) {
+    customs = customs.filter((item) => !['procInstId','status'].includes(item.name))
+  }
 
   customs = transformIdentifier(
     customs.map(({ name, label, typeAnnotation }) => {
@@ -194,7 +201,7 @@ export function getProcessSystemVariables(processEle: ProcessElementV2) {
 
   const systempVars = [
     {
-      name: '流程变量',
+      title: '流程变量',
       value: processV2.name,
       children: [
         startNode,
@@ -203,7 +210,7 @@ export function getProcessSystemVariables(processEle: ProcessElementV2) {
       icon: 'category',
     },
     {
-      name: '流程数据',
+      title: '流程数据',
       value: '流程数据',
       children: [
         ...customs
@@ -247,7 +254,7 @@ export function getFlowSystemVariables(processEle: ProcessElementV2) {
   const elements: ProcessElementV2[] = getPreviousTask(prefixElement);
   const prevtasksVar = elements.map((item) => {
     return {
-      label: item.name,
+      label: item.title,
       value: item.name,
       icon: item.type,
       children: [
@@ -547,6 +554,7 @@ function genCurNodeVariable(prefix: string[] = []) {
   const curr = new CompletionProperty({
     name: 'curr',
     value: 'curr',
+    expression: genMemberExpression([...prefix, 'curr'].join('.')),
     children: genConstants([...prefix, 'curr'], [
       // 当前节点标题
       'nodeTitle',
@@ -582,6 +590,7 @@ function genPreNodeVariable(prefix: string[] = []) {
   const pre = new CompletionProperty({
     name: 'pre',
     value: 'pre',
+    expression: genMemberExpression([...prefix, 'pre'].join('.')),
     children: genConstants([...prefix, 'pre'], [
       // 上一节点(审批)标识
       'nodeTitle',
@@ -639,6 +648,7 @@ export function getProcessVariableSuggestions(node: LogicItem): CompletionProper
     name: processV2.name,
     value: 'processSystem',
     concept: 'processV2',
+    rootName: 'processSystem',
     selectable: false,
     children: [
       // 生成流程变量
@@ -679,6 +689,7 @@ export function getProcessVariableSuggestions(node: LogicItem): CompletionProper
       name: processV2.name,
       value: 'custom',
       concept: 'processV2',
+      rootName: 'custom',
       selectable: false,
       children: [],
     };
@@ -694,6 +705,5 @@ export function getProcessVariableSuggestions(node: LogicItem): CompletionProper
     });
     list.push(customVariable);
   }
-  console.log(list[0])
   return list;
 }