100011797 3 лет назад
Родитель
Сommit
28d9532c53
2 измененных файлов с 23 добавлено и 9 удалено
  1. 15 5
      src/pages/rule-engine/Scene/Save/index.tsx
  2. 8 4
      src/pages/rule-engine/Scene/index.tsx

+ 15 - 5
src/pages/rule-engine/Scene/Save/index.tsx

@@ -1,16 +1,26 @@
 import { Modal } from '@/components';
 import { Form, Input } from 'antd';
 import TriggerWay from '@/pages/rule-engine/Scene/Save/components/TriggerWay';
+import type { SceneItem } from '@/pages/rule-engine/Scene/typings';
+import { useEffect } from 'react';
+
 interface Props {
   close: () => void;
+  data: Partial<SceneItem>;
 }
 
 export default (props: Props) => {
   const [form] = Form.useForm();
 
+  useEffect(() => {
+    form.setFieldsValue({
+      ...props.data,
+    });
+  }, [props.data]);
+
   return (
     <Modal
-      title={'新增'}
+      title={props.data?.id ? '编辑' : '新增'}
       maskClosable={false}
       visible
       onCancel={() => {
@@ -43,10 +53,10 @@ export default (props: Props) => {
           initialValue={'device'}
         >
           <TriggerWay
-            onSelect={(val) => {
-              console.log(val);
-            }}
-            disabled={false}
+            // onSelect={(val) => {
+            //   // console.log(val);
+            // }}
+            disabled={!!props.data.id}
           />
         </Form.Item>
       </Form>

+ 8 - 4
src/pages/rule-engine/Scene/index.tsx

@@ -36,6 +36,7 @@ const Scene = () => {
   const { permission } = PermissionButton.usePermission('rule-engine/Scene');
   const [searchParams, setSearchParams] = useState<any>({});
   const [visible, setVisible] = useState<boolean>(false);
+  const [current, setCurrent] = useState<Partial<SceneItem>>({});
   const history = useHistory();
 
   const deleteById = async (id: string) => {
@@ -97,9 +98,8 @@ const Scene = () => {
             : undefined
         }
         onClick={() => {
-          // const url = getMenuPathByCode('rule-engine/Scene/Save');
-          // history.push(`${url}?id=${record.id}`);
           setVisible(true);
+          setCurrent(record);
         }}
       >
         <EditOutlined />
@@ -344,6 +344,7 @@ const Scene = () => {
             onClick={() => {
               // const url = getMenuPathByCode('rule-engine/Scene/Save');
               // history.push(url);
+              setCurrent({});
               setVisible(true);
             }}
           >
@@ -366,8 +367,10 @@ const Scene = () => {
                   title: '查看',
                 }}
                 onClick={() => {
-                  const url = getMenuPathByCode('rule-engine/Scene/Save');
-                  history.push(`${url}?id=${record.id}`, { view: true });
+                  // const url = getMenuPathByCode('rule-engine/Scene/Save');
+                  // history.push(`${url}?id=${record.id}`, { view: true });
+                  // setCurrent({})
+                  // setVisible(true)
                 }}
               >
                 <EyeOutlined />
@@ -379,6 +382,7 @@ const Scene = () => {
       />
       {visible && (
         <Save
+          data={current}
           close={() => {
             setVisible(false);
           }}