fix: 修复icon加载问题

JackySoft · Sep 26, 2024 · 9f69d72 · 9f69d72
1 parent a0207d4
commit 9f69d72
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/packages/admin/src/components/Menu/Menu.tsx b/packages/admin/src/components/Menu/Menu.tsx
@@ -32,10 +32,12 @@ const MenuComponent: React.FC = () => {
         const iconsList: { [key: string]: any } = Icons;
         if (item.buttons?.length || !item.children) {
           const path = `/project/${env}/${projectId}/${item.page_id || 0}`;
-          return treeList.push(getMenuItem(item.name, path, React.createElement(iconsList[item.icon])));
+          return treeList.push(getMenuItem(item.name, path, iconsList[item.icon] && React.createElement(iconsList[item.icon])));
         }
         const path = `/project/${env}/${projectId}/${item.id}`;
-        treeList.push(getMenuItem(item.name, path, React.createElement(iconsList[item.icon]), getTreeMenu(item.children || [])));
+        treeList.push(
+          getMenuItem(item.name, path, iconsList[item.icon] && React.createElement(iconsList[item.icon]), getTreeMenu(item.children || [])),
+        );
       }
     });
     return treeList;

diff --git a/packages/editor/src/packages/Scene/SearchForm/SearchForm.tsx b/packages/editor/src/packages/Scene/SearchForm/SearchForm.tsx
@@ -154,7 +154,7 @@ const SearchForm = ({ id, type, config, elements, onSearch, onChange, onReset }:
   const iconsList: { [key: string]: any } = icons;
   return (
     visible && (
-      <FormContext.Provider value={form}>
+      <FormContext.Provider value={{ form, formId: id, setFormData }}>
         <Form form={form} layout="inline" style={config.style} data-id={id} data-type={type} onValuesChange={handleValuesChange}>
           <div className={styles.formWrap} ref={drop} style={!isExpand ? { height: 32, overflow: 'hidden' } : {}}>
             {elements.length ? <MarsRender elements={elements} /> : <div className="slots">拖拽表单组件到这里</div>}

diff --git a/packages/materials/Scene/SearchForm/SearchForm.tsx b/packages/materials/Scene/SearchForm/SearchForm.tsx
@@ -126,7 +126,7 @@ const SearchForm = ({ id, type, config, elements, onSearch, onChange, onReset }:
   const iconsList: { [key: string]: any } = icons;
   return (
     visible && (
-      <FormContext.Provider value={form}>
+      <FormContext.Provider value={{ form, formId: id, setFormData }}>
         <Form form={form} layout="inline" style={config.style} onValuesChange={handleValuesChange}>
           <div className={styles.formWrap} style={!isExpand ? { height: 32, overflow: 'hidden' } : {}}>
             <MarsRender elements={elements} />