Merge xyh

Next xyh

src/pages/system/Department/Assets/product/bind.tsx

@@ -39,9 +39,9 @@ const Bind = observer((props: Props) => {
         id: 'pages.table.name',
         defaultMessage: '名称',
       }),
-      search: {
-        transform: (value) => ({ name$LIKE: value }),
-      },
+      // search: {
+      //   transform: (value) => ({ name$LIKE: value }),
+      // },
     },
     {
       dataIndex: 'describe',

src/pages/system/Department/Assets/product/index.tsx

@@ -83,9 +83,9 @@ export default observer((props: { parentId: string }) => {
         id: 'pages.table.name',
         defaultMessage: '名称',
       }),
-      search: {
-        transform: (value) => ({ name$LIKE: value }),
-      },
+      // search: {
+      //   transform: (value) => ({ name$LIKE: value }),
+      // },
       width: 180,
       ellipsis: true,
     },

src/pages/system/Department/Member/bind.tsx

@@ -45,9 +45,9 @@ const Bind = observer((props: Props) => {
         id: 'pages.system.username',
         defaultMessage: '用户名',
       }),
-      search: {
-        transform: (value) => ({ username$LIKE: value }),
-      },
+      // search: {
+      //   transform: (value) => ({ username$LIKE: value }),
+      // },
     },
   ];
 

src/pages/system/Department/Member/index.tsx

@@ -61,9 +61,9 @@ const Member = observer((props: { parentId: string }) => {
         id: 'pages.system.username',
         defaultMessage: '用户名',
       }),
-      search: {
-        transform: (value) => ({ username$LIKE: value }),
-      },
+      // search: {
+      //   transform: (value) => ({ username$LIKE: value }),
+      // },
       width: 120,
     },
     {

src/pages/system/Menu/Setting/index.tsx

@@ -174,6 +174,7 @@ export default observer(() => {
       });
     } else {
       message.warning('请配置系统菜单');
+      setLoading(false);
     }
   };
 

src/pages/system/Platforms/save.tsx

@@ -39,6 +39,8 @@ export default (props: SaveProps) => {
   const [loading, setLoading] = useState(false);
   const { permission: RolePermission } = usePermissions('system/Role');
 
+  console.log(RolePermission)
+
   const SchemaField = createSchemaField({
     components: {
       Checkbox,
@@ -87,7 +89,7 @@ export default (props: SaveProps) => {
           });
         },
       }),
-    [props.data],
+    [props.data, RolePermission],
   );
 
   const getDetail = async (id: string) => {
@@ -116,7 +118,7 @@ export default (props: SaveProps) => {
         form.reset();
       }
     }
-  }, [props.type, props.visible]);
+  }, [props.type, props.visible, RolePermission]);
 
   const schema: ISchema = {
     type: 'object',