fix types

xlorne · xlorne · commit 3ee2eb4ea28c · 2026-02-26T14:17:10.000+08:00
diff --git a/frontend/apps/app-pc/src/config/plugin-view.tsx b/frontend/apps/app-pc/src/config/plugin-view.tsx
@@ -1,4 +1,4 @@
-import {ViewPlugin} from "@flow-engine/flow-types";
+import {ViewBindPlugin} from "@flow-engine/flow-types";
 import {LeaveView} from "@/views/leave.tsx";
 
-ViewPlugin.getInstance().register('default',LeaveView);
+ViewBindPlugin.getInstance().register('default',LeaveView);
diff --git a/frontend/packages/flow-pcs/flow-design/src/api/record.ts b/frontend/packages/flow-pcs/flow-design/src/api/record.ts
diff --git a/frontend/packages/flow-pcs/flow-form/src/components/form/index.tsx b/frontend/packages/flow-pcs/flow-form/src/components/form/index.tsx
@@ -11,7 +11,7 @@ export const FlowFormView: React.FC<ViewComponentProps> = (props) => {
 
     return (
         <Form
-            form={form}
+            form={form as any}
             layout={"vertical"}
             onBlur={()=>{
                 const latestValues = form.getFieldsValue();
diff --git a/frontend/packages/flow-pcs/flow-pc-approval/src/components/flow-approval/components/flow-node-history.tsx b/frontend/packages/flow-pcs/flow-pc-approval/src/components/flow-approval/components/flow-node-history.tsx
@@ -1,8 +1,8 @@
 import React from "react";
 import {useApprovalContext} from "@/components/flow-approval/hooks/use-approval-context";
-import {ProcessNode} from "@/components/flow-approval/typings";
+import {ProcessNode} from "@flow-engine/flow-types";
 import {Timeline, Tag, Empty, Typography} from "antd";
-import {CheckCircleFilled, ClockCircleOutlined, LoadingOutlined, SyncOutlined} from "@ant-design/icons";
+import {CheckCircleFilled, ClockCircleOutlined, SyncOutlined} from "@ant-design/icons";
 
 const {Text} = Typography;
 
diff --git a/frontend/packages/flow-pcs/flow-pc-approval/src/components/flow-approval/components/form-view-component.tsx b/frontend/packages/flow-pcs/flow-pc-approval/src/components/flow-approval/components/form-view-component.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import {useApprovalContext} from "@/components/flow-approval/hooks/use-approval-context";
-import {ViewPlugin} from "@flow-engine/flow-types";
+import {ViewBindPlugin} from "@flow-engine/flow-types";
 import { Form } from "antd";
 
 interface FormViewComponentProps{
@@ -9,7 +9,7 @@ interface FormViewComponentProps{
 
 export const FormViewComponent: React.FC<FormViewComponentProps> = (props) => {
     const {state, context} = useApprovalContext();
-    const ViewComponent = ViewPlugin.getInstance().get(state.flow?.view || 'default');
+    const ViewComponent = ViewBindPlugin.getInstance().get(state.flow?.view || 'default');
     // 是否可合并审批
     const mergeable = state.flow?.mergeable || false;
     const todos = state.flow?.todos || [];
@@ -54,7 +54,7 @@ export const FormViewComponent: React.FC<FormViewComponentProps> = (props) => {
                 {viewForms.map((item, index) => (
                     <ViewComponent
                         key={index}
-                        form={item.instance}
+                        form={item.instance as any}
                         onValuesChange={props.onValuesChange}
                     />
                 ))}
diff --git a/frontend/packages/flow-pcs/flow-pc-approval/src/components/flow-approval/context/index.ts b/frontend/packages/flow-pcs/flow-pc-approval/src/components/flow-approval/context/index.ts
@@ -1,5 +1,5 @@
 import React from "react";
-import {ApprovalLayoutProps, State} from "../typings";
+import {State,ApprovalLayoutProps} from "../typings";
 import {Presenter} from "../presenters";
 
 export class ApprovalContextScope {
diff --git a/frontend/packages/flow-pcs/flow-pc-approval/src/components/flow-approval/hooks/use-approval-context.ts b/frontend/packages/flow-pcs/flow-pc-approval/src/components/flow-approval/hooks/use-approval-context.ts
@@ -4,7 +4,7 @@ import {ApprovalContext, ApprovalContextScope} from "../context";
 import {ApprovalReduxState, updateState} from "../store";
 import {Presenter} from "../presenters";
 import {FlowApprovalApiImpl} from "../model";
-import {ApprovalLayoutProps} from "@/components/flow-approval/typings";
+import {ApprovalLayoutProps} from "../typings";
 
 export const useApprovalContext = () => {
     const context = React.useContext(ApprovalContext);
diff --git a/frontend/packages/flow-pcs/flow-pc-approval/src/components/flow-approval/index.tsx b/frontend/packages/flow-pcs/flow-pc-approval/src/components/flow-approval/index.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import {Drawer} from "@flow-engine/flow-pc-ui";
 import {detail} from "@/api/record";
-import {FlowContent} from "@/components/flow-approval/typings";
+import {FlowContent} from "@flow-engine/flow-types";
 import {ApprovalLayout} from "@/components/flow-approval/layout";
 
 interface ApprovalPanelProps {
diff --git a/frontend/packages/flow-pcs/flow-pc-approval/src/components/flow-approval/layout/index.tsx b/frontend/packages/flow-pcs/flow-pc-approval/src/components/flow-approval/layout/index.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import {ApprovalLayoutProps} from "@/components/flow-approval/typings";
+import {ApprovalLayoutProps} from "../typings";
 import {Provider} from "react-redux";
 import {approvalStore} from "@/components/flow-approval/store";
 import {ApprovalContext} from "@/components/flow-approval/context";
diff --git a/frontend/packages/flow-pcs/flow-pc-approval/src/components/flow-approval/typings/index.ts b/frontend/packages/flow-pcs/flow-pc-approval/src/components/flow-approval/typings/index.ts
@@ -1,92 +1,8 @@
-export interface FormFieldMeta{
-    id:string;
-    name:string;
-    code:string;
-    type:string;
-    require:boolean;
-    defaultValue:string;
-}
-
-export interface FlowMeta {
-    name:string;
-    code:string;
-    fields:FormFieldMeta[];
-    subForms:FlowMeta[];
-}
-
-
-export interface Body{
-    recordId:number;
-    title:string;
-    data:Record<string,any>;
-    recordState:number;
-    flowState:number;
-}
-
-export interface ActionDisplay{
-    title:string;
-    style:string;
-    icon:string;
-}
-
-export interface FlowAction{
-    id:string;
-    title:string;
-    type:string;
-    display:ActionDisplay;
-    enable:boolean;
-}
-
-export interface FlowOperator {
-    id:number;
-    name:string;
-}
-
-export interface History{
-    recordId:number;
-    title:string;
-    advice:string;
-    signKey:string;
-    nodeName:string;
-    nodeId:string;
-    nodeType:string
-    updateTime:number;
-}
-
-export interface FlowOperatorBody{
-    advice:string;
-    signKey:string;
-    approveTime:number;
-    flowOperator:FlowOperator;
-}
-
-export interface ProcessNode{
-    nodeId:string;
-    nodeName:string;
-    nodeType:string;
-    state:number;
-    operators:FlowOperatorBody[]
-}
-
-
-export interface FlowContent {
-    recordId:number;
-    workId:string;
-    workCode:string;
-    view:string;
-    adviceNullable:boolean;
-    signable:boolean;
-    form:FlowMeta;
-    todos:Body[];
-    actions:FlowAction[];
-    mergeable:boolean;
-    createOperator:FlowOperator;
-    currentOperator:FlowOperator;
-    flowState:number;
-    recordState:number;
-    histories:History[];
-}
+import {FlowContent,ProcessNode} from "@flow-engine/flow-types";
 
+/**
+ * 流程审批布局组件属性
+ */
 export interface ApprovalLayoutProps {
     content:FlowContent;
     onClose?:() => void;
diff --git a/frontend/packages/flow-types/src/index.ts b/frontend/packages/flow-types/src/index.ts
@@ -1,2 +1,2 @@
-export * from '@/plugins/view';
+export * from '@/plugins';
 export * from '@/types';
diff --git a/frontend/packages/flow-types/src/plugins/index.ts b/frontend/packages/flow-types/src/plugins/index.ts
@@ -0,0 +1 @@
+export * from './view-bind-plugin';
diff --git a/frontend/packages/flow-types/src/plugins/view-bind-plugin.tsx b/frontend/packages/flow-types/src/plugins/view-bind-plugin.tsx
@@ -1,11 +1,14 @@
 import React from "react";
 import {ViewComponentProps} from "@/types/view-component";
 
-export class ViewPlugin{
+/**
+ *  视图绑定插件，提供视图组件注册和获取功能
+ */
+export class ViewBindPlugin {
 
     private readonly cache:Map<string,React.ComponentType<ViewComponentProps>>;
 
-    private  static readonly instance:ViewPlugin = new ViewPlugin();
+    private  static readonly instance:ViewBindPlugin = new ViewBindPlugin();
 
     private constructor(){
         this.cache = new Map();
diff --git a/frontend/packages/flow-types/src/type.d.ts b/frontend/packages/flow-types/src/type.d.ts
diff --git a/frontend/packages/flow-types/src/types/flow-approval.ts b/frontend/packages/flow-types/src/types/flow-approval.ts
@@ -0,0 +1,117 @@
+/**
+ *  流程表单字段元数据
+ */
+export interface FlowFormFieldMeta {
+    id:string;
+    name:string;
+    code:string;
+    type:string;
+    require:boolean;
+    defaultValue:string;
+}
+
+/**
+ * 流程表单元数据
+ */
+export interface FlowFromMeta {
+    name:string;
+    code:string;
+    fields:FlowFormFieldMeta[];
+    subForms:FlowFromMeta[];
+}
+
+/**
+ * 流程操作显示对象
+ */
+export interface FlowActionDisplay {
+    title:string;
+    style:string;
+    icon:string;
+}
+
+/**
+ * 流程操作对象
+ */
+export interface FlowAction{
+    id:string;
+    title:string;
+    type:string;
+    display:FlowActionDisplay;
+    enable:boolean;
+}
+
+/**
+ *  流程操作人对象
+ */
+export interface FlowOperator {
+    id:number;
+    name:string;
+}
+
+/**
+ *  流程操作记录对象
+ */
+export interface History{
+    recordId:number;
+    title:string;
+    advice:string;
+    signKey:string;
+    nodeName:string;
+    nodeId:string;
+    nodeType:string
+    updateTime:number;
+}
+
+/**
+ *  流程待办对象
+ */
+export interface FlowTodo {
+    recordId:number;
+    title:string;
+    data:Record<string,any>;
+    recordState:number;
+    flowState:number;
+}
+
+
+/**
+ *  流程审批人对象
+ */
+export interface FlowApprovalOperator {
+    advice:string;
+    signKey:string;
+    approveTime:number;
+    flowOperator:FlowOperator;
+}
+
+/**
+ * 流程节点对象
+ */
+export interface ProcessNode{
+    nodeId:string;
+    nodeName:string;
+    nodeType:string;
+    state:number;
+    operators:FlowApprovalOperator[]
+}
+
+/**
+ * 流程审批内容对象
+ */
+export interface FlowContent {
+    recordId:number;
+    workId:string;
+    workCode:string;
+    view:string;
+    adviceNullable:boolean;
+    signable:boolean;
+    form:FlowFromMeta;
+    todos:FlowTodo[];
+    actions:FlowAction[];
+    mergeable:boolean;
+    createOperator:FlowOperator;
+    currentOperator:FlowOperator;
+    flowState:number;
+    recordState:number;
+    histories:History[];
+}
diff --git a/frontend/packages/flow-types/src/types/form-instance.ts b/frontend/packages/flow-types/src/types/form-instance.ts
@@ -0,0 +1,11 @@
+export type NamePath = string | number | boolean | (string | number | boolean)[];
+
+export interface FormInstance{
+    getFieldValue: (name: NamePath) => any;
+    getFieldsValue: () => any;
+    getFieldError: (name: NamePath) => string[];
+    resetFields: (fields?: NamePath[]) => void;
+    setFieldsValue: (values: any) => void;
+    setFiledValue: (name: NamePath, value: any) => void;
+    submit: () => void;
+}
diff --git a/frontend/packages/flow-types/src/types/index.ts b/frontend/packages/flow-types/src/types/index.ts
@@ -1 +1,3 @@
-export * from './view-component';
+export * from './view-component';
+export * from './form-instance';
+export * from './flow-approval';
diff --git a/frontend/packages/flow-types/src/types/view-component.ts b/frontend/packages/flow-types/src/types/view-component.ts
@@ -1,4 +1,4 @@
-import {FormInstance} from "antd";
+import {FormInstance} from "./form-instance";
 
 export type ViewComponentProps  = {
     form:FormInstance;
