12334

src/global.less

@@ -319,4 +319,7 @@ table {
 }
 .ant-drawer-open{
   transform: none !important;
+}
+.ant-pro-table-list-toolbar{
+  overflow: hidden !important;
 }
\ No newline at end of file

src/pages/platform/Custom/index.jsx

@@ -193,19 +193,10 @@ const Deviceprovide = (props) => {
     function extraAction(text, record, _, action) {
         return [
             getPrem("equipmentCustomer_save", action, '修改', async () => {
-                await setcuritem(record);
-                setTimeout(() => {
-                    doFetch({ url: "/ngic-auth/sysCustomer/query/detail", params: { id: record.id } }).then(res => {
-                        if (res.code == "0000") {
-                            let data = res?.data?.data || {};
-                            for (let i in defaultFields) {
-                                defaultFields[i].value = data[i];
-                            }
-                            dispatch({ type: "edit", fields: { ...defaultFields, ...extrafields } })
-                        }
-                    })
-                }, 400)
-
+                await setcuritem({
+                    ...record,
+                    key: "edit"
+                });
             }),
             getPrem("equipmentCustomer_deleteById", action, '删除', null, {
                 title: "确认删除该客户？",
@@ -253,6 +244,17 @@ const Deviceprovide = (props) => {
         let res = await tempfields("/ngic-auth/sysCustomerChar/queryCommonList", { id: curitem.id })
         setextrafields(res?.fields);
         setsubdata(res?.data);
+        if (curitem.key == "edit") {
+            doFetch({ url: "/ngic-auth/sysCustomer/query/detail", params: { id: curitem.id } }).then(res => {
+                if (res.code == "0000") {
+                    let data = res?.data?.data || {};
+                    for (let i in defaultFields) {
+                        defaultFields[i].value = data[i];
+                    }
+                    dispatch({ type: "edit", fields: { ...defaultFields, ...extrafields } })
+                }
+            })
+        }
     }, [curitem])
 
 

src/pages/platform/Specialproperties/Fieldmanage.jsx

@@ -15,10 +15,10 @@ const tabList = [
       key: "tab1",
       tab: <span style={{ fontSize: 14 }}>公共字段</span>,
     },
-    {
-      key: "tab2",
-      tab: <span style={{ fontSize: 14 }}>条件字段</span>,
-    },
+    // {
+    //   key: "tab2",
+    //   tab: <span style={{ fontSize: 14 }}>条件字段</span>,
+    // },
   ],
   initState = {
     vs: false,