@coding-flow/flow-pc-approval 0.0.46 → 0.0.48

package/dist/components/flow-approval/components/action/custom.js

@@ -2,36 +2,26 @@ import { jsx } from "react/jsx-runtime";
 import "react";
 import { message } from "antd";
 import { useApprovalContext } from "@coding-flow/flow-approval-presenter";
-import { GroovyScriptConvertorUtil, ViewBindPlugin } from "@coding-flow/flow-core";
+import { EventBus, ViewBindPlugin } from "@coding-flow/flow-core";
 import { ActionFactory } from "./factory.js";
 import { CustomStyleButton } from "../custom-style-button.js";
 import { APPROVAL_ACTION_CUSTOM_KEY } from "../../index.js";
 const CustomAction = (props)=>{
+    console.log('custom11:', props);
     const action = props.action;
     const { context } = useApprovalContext();
     const actionPresenter = context.getPresenter().getFlowActionPresenter();
-    const script = action.script || '';
-    const returnData = GroovyScriptConvertorUtil.getReturnScript(script);
-    const triggerType = returnData.replaceAll('\'', '');
+    const triggerType = action.triggerType;
+    const triggerFrontEvent = action.triggerFrontEvent;
     const ActionView = ViewBindPlugin.getInstance().get(APPROVAL_ACTION_CUSTOM_KEY);
     if (ActionView) return /*#__PURE__*/ jsx(ActionView, {
         ...props
     });
-    const FlowActionComponent = ActionFactory.getInstance().getFlowActionComponent({
-        ...props.action,
-        type: triggerType
-    });
-    if (FlowActionComponent) return /*#__PURE__*/ jsx(FlowActionComponent, {
-        action: action,
-        onClickCheck: (actionId)=>{
-            if (props.onClickCheck) return props.onClickCheck?.(actionId);
-            return false;
-        }
-    });
-    return /*#__PURE__*/ jsx(CustomStyleButton, {
+    if (triggerFrontEvent) return /*#__PURE__*/ jsx(CustomStyleButton, {
         display: props.action.display,
         onClick: ()=>{
-            if (props.onClickCheck?.(action.id)) actionPresenter.action(action.id).then((res)=>{
+            if (triggerFrontEvent) EventBus.getInstance().emit(triggerFrontEvent);
+            else if (props.onClickCheck?.(action.id)) actionPresenter.action(action.id).then((res)=>{
                 if (res.success) {
                     message.success("操作成功");
                     context.close();
@@ -40,5 +30,18 @@ const CustomAction = (props)=>{
         },
         title: action.title
     });
+    if (triggerType) {
+        const FlowActionComponent = ActionFactory.getInstance().getFlowActionComponent({
+            ...props.action,
+            type: triggerType
+        });
+        if (FlowActionComponent) return /*#__PURE__*/ jsx(FlowActionComponent, {
+            action: action,
+            onClickCheck: (actionId)=>{
+                if (props.onClickCheck) return props.onClickCheck?.(actionId);
+                return false;
+            }
+        });
+    }
 };
 export { CustomAction };

package/dist/components/flow-approval/components/form-view-component.js

@@ -8,6 +8,7 @@ const FormViewComponent = (props)=>{
     const { state, context } = useApprovalContext();
     const review = state.review || false;
     const ViewComponent = ViewBindPlugin.getInstance().get(state.flow?.view || 'default') || FlowFormView;
+    const viewCode = state.flow?.code;
     const flowForm = state.flow?.form;
     const fieldPermissions = state.flow?.fieldPermissions || [];
     const formMeta = react.useMemo(()=>context.convertMeta(flowForm || void 0, fieldPermissions), [
@@ -60,7 +61,8 @@ const FormViewComponent = (props)=>{
             initData: context.getInitData(),
             formList: formList,
             onValuesChange: props.onValuesChange,
-            onMergeRecordIdsSelected: handleMergeRecordIdsSelected
+            onMergeRecordIdsSelected: handleMergeRecordIdsSelected,
+            viewCode: viewCode
         });
         return /*#__PURE__*/ jsx(Fragment, {
             children: formList.map((item, index)=>/*#__PURE__*/ jsx(ViewComponent, {
@@ -71,7 +73,8 @@ const FormViewComponent = (props)=>{
                     initData: context.getInitData(),
                     meta: formMeta,
                     form: item.form,
-                    onValuesChange: props.onValuesChange
+                    onValuesChange: props.onValuesChange,
+                    viewCode: viewCode
                 }, index))
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coding-flow/flow-pc-approval",
-  "version": "0.0.46",
+  "version": "0.0.48",
   "description": "flow-engine pc form approval components",
   "type": "module",
   "keywords": [
@@ -39,19 +39,19 @@
     "dayjs": "^1.11.19",
     "immer": "^11.1.3",
     "react-redux": "^9.2.0",
-    "@coding-flow/flow-icons": "0.0.46",
-    "@coding-flow/flow-types": "0.0.46",
-    "@coding-flow/flow-pc-ui": "0.0.46",
-    "@coding-flow/flow-core": "0.0.46",
-    "@coding-flow/flow-approval-presenter": "0.0.46",
-    "@coding-flow/flow-pc-form": "0.0.46"
+    "@coding-flow/flow-core": "0.0.48",
+    "@coding-flow/flow-approval-presenter": "0.0.48",
+    "@coding-flow/flow-types": "0.0.48",
+    "@coding-flow/flow-icons": "0.0.48",
+    "@coding-flow/flow-pc-ui": "0.0.48",
+    "@coding-flow/flow-pc-form": "0.0.48"
   },
   "devDependencies": {
-    "@coding-flow/flow-types": "0.0.46",
-    "@coding-flow/flow-approval-presenter": "0.0.46",
-    "@coding-flow/flow-core": "0.0.46",
-    "@coding-flow/flow-pc-ui": "0.0.46",
-    "@coding-flow/flow-pc-form": "0.0.46"
+    "@coding-flow/flow-types": "0.0.48",
+    "@coding-flow/flow-approval-presenter": "0.0.48",
+    "@coding-flow/flow-pc-form": "0.0.48",
+    "@coding-flow/flow-core": "0.0.48",
+    "@coding-flow/flow-pc-ui": "0.0.48"
   },
   "scripts": {
     "build": "rslib build",