fix: 修复通过模板生成页面的相关缺陷 (#519)

* fix: generate page style * chore: home page * style: fix by prettier
apptools-lab · Sep 10, 2020 · 82851a6 · 82851a6
1 parent 2a0e1ac
commit 82851a6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/extensions/iceworks-ui-builder/web/src/pages/PageCreator/configForm.tsx b/extensions/iceworks-ui-builder/web/src/pages/PageCreator/configForm.tsx
@@ -11,6 +11,13 @@ import callService from '../../callService';
 
 nextComponents.setup();
 
+const tmpComponents = {};
+forIn(nextComponents, (value, key) => {
+  if (key !== 'setup') {
+    tmpComponents[key] = value;
+  }
+});
+
 export default ({
   templateSchema,
   originResetData,
@@ -26,16 +33,8 @@ export default ({
   const [routerConfig, setRouterConfig] = useState([]);
   const [isConfigurableRouter, setIsConfigurableRouter] = useState(true);
   const [templateData, setTemplateData] = useState({});
-  const [components, setComponents] = useState({});
 
   useEffect(() => {
-    const tmpComponents = {};
-    forIn(nextComponents, (value, key) => {
-      if (key !== 'setup') {
-        tmpComponents[key] = value;
-      }
-    });
-    setComponents(tmpComponents);
     setLoading(false);
   }, []);
 
@@ -159,7 +158,7 @@ export default ({
               intl.formatMessage({ id: 'web.iceworksUIBuilder.pageCreator.defaultDescription' })}
           </p>
           <SchemaForm
-            components={components}
+            components={tmpComponents}
             schema={templateSchema}
             onSubmit={(setting) => {
               getRouterForm(setting);

diff --git a/packages/material-ui/package.json b/packages/material-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@iceworks/material-ui",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "Material panel for display and select materials.",
   "files": [
     "demo/",
@@ -54,6 +54,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@iceworks/material-ui@0.1.10/build/index.html",
+  "homepage": "https://unpkg.com/@iceworks/material-ui@0.1.11/build/index.html",
   "gitHead": "fc5b35f95ab4cc24898845916acf598c2f34d576"
 }
diff --git a/packages/material-ui/src/components/page.module.scss b/packages/material-ui/src/components/page.module.scss
@@ -6,7 +6,7 @@
   cursor: pointer;
   overflow: hidden;
   position: relative;
-  height: 120px;
+  height: 100%;
   padding: 5px 20px;
   margin-bottom: 24px;
   background-color: #252422;
@@ -20,6 +20,15 @@
 
   &.selected {
     border-color: $color-line1-3;
+
+    .selectedIcon {
+      position: absolute;
+      top: 6px;
+      right: 6px;
+      border: 1px solid $color-line1-3;
+      border-radius: 50%;
+      padding: 4px;
+    }
   }
 }
 
@@ -43,10 +52,6 @@
   padding: 10px 0;
 }
 
-.desc {
-  color: $color-text1-2;
-}
-
 .actions {
   position: absolute;
   bottom: 0;