update custom

Author: xlorne

…gn/src/components/script/utils/format.ts frontend/packages/flow-core/src/groovy.tsfrontend/packages/flow-pc/flow-pc-design/src/components/script/utils/format.ts renamed to frontend/packages/flow-core/src/groovy.ts frontend/packages/flow-pc/flow-pc-design/src/components/script/utils/format.ts renamed to frontend/packages/flow-core/src/groovy.ts

@@ -1,3 +1,14 @@
+/** 自定义脚本标记 */
+export const CUSTOM_SCRIPT = '@CUSTOM_SCRIPT';
+
+/** 脚本标题标记 */
+export const SCRIPT_TITLE = '@SCRIPT_TITLE';
+
+
+/** 脚本元数据标记 */
+export const SCRIPT_META = '@SCRIPT_META';
+
+
 /**
  * Groovy脚本格式化器
  */
@@ -318,3 +329,131 @@ export interface FormatOptions {
     maxLineLength?: number;         // 最大行长度
     preserveEmptyLines?: boolean;   // 保留空行
 }
+
+
+
+/**
+ * Groovy脚本转换器工具类，提供一些通用的脚本处理方法
+ */
+export class GroovyScriptConvertorUtil {
+
+    /**
+     * 判断脚本是否包含自定义注释标记
+     * @param script
+     */
+    public static isCustomScript(script: string): boolean {
+        return script.includes(CUSTOM_SCRIPT);
+    }
+
+
+    /**
+     *  格式化脚本内容，去除多余空白等
+     *  @param script
+     */
+    public static formatScript(script: string): string {
+        // 这里可以添加一些格式化逻辑，比如统一换行、缩进等
+        return GroovyFormatter.formatScript(script);
+    }
+
+
+    /**
+     *  将普通脚本转换为包含自定义注释标记的脚本
+     * @param script
+     */
+    public static toCustomScript(script: string): string {
+        if (GroovyScriptConvertorUtil.isCustomScript(script)) {
+            return GroovyFormatter.formatScript(script);
+        }
+        return GroovyFormatter.formatScript(`// ${CUSTOM_SCRIPT}\n${script}`);
+    }
+
+
+    /**
+     * 获取脚本中的标题注释内容
+     * @param script
+     */
+    public static getScriptTitle(script: string): string {
+        const titleMatch = script.match(new RegExp(`//\\s*${SCRIPT_TITLE}\\s*(.+)`));
+        if (titleMatch) {
+            return titleMatch[1].trim();
+        }
+        return '';
+    }
+
+    /**
+     * 更新脚本中的标题注释内容，如果不存在则添加
+     * @param script
+     * @param title
+     */
+    public static updateScriptTitle(script: string, title: string): string {
+        const titleComment = `// ${SCRIPT_TITLE} ${title}`;
+        if (GroovyScriptConvertorUtil.getScriptTitle(script)) {
+            return script.replace(new RegExp(`//\\s*${SCRIPT_TITLE}\\s*.+`), titleComment);
+        } else {
+            return `${titleComment}\n${script}`;
+        }
+    }
+
+
+    /**
+     * 获取脚本中的元数据
+     * @param script
+     */
+    public static getScriptMeta(script: string): string {
+        const titleMatch = script.match(new RegExp(`//\\s*${SCRIPT_META}\\s*(.+)`));
+        if (titleMatch) {
+            return titleMatch[1].trim();
+        }
+        return '';
+    }
+
+
+    /**
+     * 更新脚本中的元数据内容，如果不存在则添加
+     * @param script
+     * @param meta
+     */
+    public static updateScriptMeta(script: string, meta: string): string {
+        const metaComment = `// ${SCRIPT_META} ${meta}`;
+        if (GroovyScriptConvertorUtil.getScriptTitle(script)) {
+            return script.replace(new RegExp(`//\\s*${SCRIPT_META}\\s*.+`), metaComment);
+        } else {
+            return `${metaComment}\n${script}`;
+        }
+    }
+
+
+    /**
+     * 清除脚本中的注释
+     * @param script
+     */
+    public static clearComments(script: string): string {
+        return script.replace(/\/\/.*$/gm, '').trim();
+    }
+
+    /**
+     * 提取脚本中的return表达式
+     * @param script
+     */
+    public static getReturnScript(script: string): string {
+        try {
+            let result = GroovyScriptConvertorUtil.clearComments(script);
+            const funcMatch = result.match(/def\s+run\s*\([^)]*\)\s*\{([\s\S]*)\}/);
+            if (funcMatch) {
+                result = funcMatch[1];
+            }
+            const returnMatch = result.match(/return\s+(.+?);?\s*$/m);
+            if (returnMatch) {
+                result = returnMatch[1].trim();
+            } else {
+                // 如果没有找到return语句，可能整个脚本就是表达式
+                result = result.trim();
+            }
+
+            return result;
+        } catch (e) {
+            return '';
+        }
+    }
+
+}

frontend/packages/flow-core/src/index.ts

@@ -4,4 +4,6 @@ export * from "./http";
 export * from "./presenter";
 export * from "./hooks.ts";
 export * from "./object.ts";
-export * from "./table.ts";
+export * from "./table.ts";
+export * from "./view-plugin.ts";
+export * from "./groovy.ts";

…w-types/src/plugins/view-bind-plugin.tsx …nd/packages/flow-core/src/view-plugin.tsfrontend/packages/flow-types/src/plugins/view-bind-plugin.tsx renamed to frontend/packages/flow-core/src/view-plugin.ts frontend/packages/flow-types/src/plugins/view-bind-plugin.tsx renamed to frontend/packages/flow-core/src/view-plugin.ts

@@ -16,7 +16,6 @@ export const CustomAction: React.FC<FlowActionProps> = (props) => {
 
     return (
         <Button
-            danger={action.type === 'REJECT'}
             onClick={() => {
                 actionPresenter.action(action.id).then((res) => {
                     if (res.success) {

frontend/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/action/custom.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import {useApprovalContext} from "@/components/flow-approval/hooks/use-approval-context";
-import {ViewBindPlugin} from "@flow-engine/flow-types";
+import {ViewBindPlugin} from "@flow-engine/flow-core";
 import {Form as AntdForm} from "antd";
 import {FlowFormView} from "@flow-engine/flow-pc-form";
 

frontend/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/form-view-component.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import {AddAuditViewPlugin, VIEW_KEY} from "../add-audit-type";
-import {ViewBindPlugin} from "@flow-engine/flow-types";
+import {ViewBindPlugin} from "@flow-engine/flow-core";
 import {Select} from "antd";
 import {useApprovalContext} from "@/components/flow-approval/hooks/use-approval-context";
 

frontend/packages/flow-pc/flow-pc-approval/src/components/flow-approval/plugins/view/add-audit-view.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import {DelegateViewPlugin, VIEW_KEY} from "../delegate-type";
-import {ViewBindPlugin} from "@flow-engine/flow-types";
+import {ViewBindPlugin} from "@flow-engine/flow-core";
 import {Select} from "antd";
 import {useApprovalContext} from "@/components/flow-approval/hooks/use-approval-context";
 

frontend/packages/flow-pc/flow-pc-approval/src/components/flow-approval/plugins/view/delegate-view.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import {ReturnViewPlugin, VIEW_KEY} from "../return-type";
-import {ViewBindPlugin} from "@flow-engine/flow-types";
+import {ViewBindPlugin} from "@flow-engine/flow-core";
 import {Select} from "antd";
 import {useApprovalContext} from "@/components/flow-approval/hooks/use-approval-context";
 

frontend/packages/flow-pc/flow-pc-approval/src/components/flow-approval/plugins/view/return-view.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import {SignKeyViewPlugin, VIEW_KEY} from "../sign-key-type";
-import {ViewBindPlugin} from "@flow-engine/flow-types";
+import {ViewBindPlugin} from "@flow-engine/flow-core";
 import {Input} from "antd";
 
 const {TextArea} = Input;

frontend/packages/flow-pc/flow-pc-approval/src/components/flow-approval/plugins/view/sign-key-view.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import {TransferViewPlugin, VIEW_KEY} from "../transfer-type";
-import {ViewBindPlugin} from "@flow-engine/flow-types";
+import {ViewBindPlugin} from "@flow-engine/flow-core";
 import {Select} from "antd";
 import {useApprovalContext} from "@/components/flow-approval/hooks/use-approval-context";