lanjianrong 3 lat temu
rodzic
commit
fbef877d59

+ 1 - 0
src/components/AnimateContent/index.tsx

@@ -14,6 +14,7 @@ const AnimateContent: FC<PropsWithChildren<AnimateContentProps>> = ({
   children,
   ...others
 }) => {
+  if (!visible) return null
   return (
     <div className={styles.pageContainer}>
       <Drawer

+ 2 - 2
src/components/Flow/src/components/Edge/index.tsx

@@ -63,10 +63,10 @@ const renderMenu = ({ dispatch, elements, togglePopver, id, flowInstance, sort }
         <ClusterOutlined />
         <span className="ml-1">审批人</span>
       </Menu.Item>
-      <Menu.Item key="2" onClick={remove}>
+      {/* <Menu.Item key="2" onClick={remove}>
         <ApartmentOutlined />
         <span className="ml-1">条件分支</span>
-      </Menu.Item>
+      </Menu.Item> */}
     </Menu>
   )
 }

+ 3 - 1
src/components/Flow/src/index.tsx

@@ -15,7 +15,9 @@ const ApprovalFlow: FC<ApprovalFlowProps> = props => {
         <ReactFlowProvider>
           {/** 顶部工具栏 */}
           <ToolBar dataId={props.id} closeAnimateContent={props.closeAnimateContent} />
-          <FlowGroph {...props} />
+          <div className="h-full w-full">
+            <FlowGroph {...props} />
+          </div>
           <FlowDrawer />
         </ReactFlowProvider>
       </FlowContextProvider>

+ 5 - 3
src/pages/Project/Management/components/DetailModal.tsx

@@ -18,7 +18,7 @@ export enum ModalType {
 
 type ProjectModalProps = ConnectProps & {
   visible: boolean
-  setVisible: (visible: boolean) => void
+  onVisibleChange: (visible: boolean) => void
   readOnly: boolean
   readOnly: boolean
   type: ModalType
@@ -31,7 +31,7 @@ type ProjectModalProps = ConnectProps & {
 }
 const DetailModal: React.FC<ProjectModalProps> = ({
   visible,
-  setVisible,
+  onVisibleChange,
   readOnly,
   dispatch,
   schema,
@@ -39,6 +39,8 @@ const DetailModal: React.FC<ProjectModalProps> = ({
   pTypeList,
   reloadTable
 }) => {
+  console.log('defaultFormData', defaultFormData)
+
   const form = useForm()
   const ref = useRef<FormInstance>(null)
   const { TabPane } = Tabs
@@ -95,7 +97,7 @@ const DetailModal: React.FC<ProjectModalProps> = ({
 
   const onFinish = async (formData, value) => {
     await trySetApproval({ ...formData, ...value, ID: defaultFormData.ID })
-    setVisible(false)
+    onVisibleChange(false)
     reloadTable()
   }
   return (

+ 4 - 2
src/pages/Project/Management/index.tsx

@@ -14,7 +14,7 @@ import { PageContainer } from '@ant-design/pro-layout'
 import type { SchemaBaseModelState } from '@/pages/Schema/Base/model'
 import { BaseMenuEnum } from '@/pages/Schema/Base'
 import { generateColumns } from '@/utils/util'
-import DetailModal from './components/DetailModal'
+import Detail from './components/Detail'
 import AnimateContent from '@/components/AnimateContent'
 
 type ListProps = ConnectProps & {
@@ -198,7 +198,9 @@ const List: React.FC<ListProps> = ({ schema, dispatch, pTypeList }) => {
       <AnimateContent
         visible={state.visible}
         onVisibleChange={visible => setState({ ...state, visible })}>
-        <DetailModal
+        <Detail
+          visible={state.visible}
+          onVisibleChange={visible => setState({ ...state, visible })}
           defaultFormData={state.defaultFormData}
           pTypeList={pTypeList}
           readOnly={state.readOnly}