@fonixtree/magic-design 0.1.96 → 0.1.99

package/es/core/Renderer/index.js

@@ -88,19 +88,36 @@ var Renderer = function Renderer(props) {
     var filterData = [];
 
     if (pageData && pageData.childNodes && pageData.childNodes.length) {
+      var graduallySetFloors = function graduallySetFloors(data, step, interval, start) {
+        if (step === void 0) {
+          step = 5;
+        }
+
+        if (interval === void 0) {
+          interval = 200;
+        }
+
+        if (start === void 0) {
+          start = 0;
+        } // 计算这一步应该显示的最终索引
+
+
+        var end = Math.min(start + step, data.length); // 更新楼层数量
+
+        setFloors(data.slice(0, end)); // 如果还有更多楼层要显示，设置一个定时器来递归调用此函数
+
+        if (end < data.length) {
+          setTimeout(function () {
+            graduallySetFloors(data, step, interval, end);
+          }, interval);
+        }
+      };
+
       filterData = pageData.childNodes.filter(function (node) {
         return (0, _coreUtil.isActiveFloor)(node.activeTerminal);
       });
-    } // 首页组建分批渲染按5个一组
-
-
-    setFloors(filterData.slice(0, 5));
-    setTimeout(function () {
-      setFloors(filterData.slice(0, 10));
-      setTimeout(function () {
-        setFloors(filterData);
-      }, 200);
-    }, 200);
+      graduallySetFloors(filterData);
+    }
   }, [pageData]);
   (0, _react.useEffect)(function () {
     setTimeout(function () {
@@ -140,7 +157,7 @@ var Renderer = function Renderer(props) {
     }
 
     return {
-      overflow: 'auto'
+      overflow: 'hidden'
     };
   };
 
@@ -148,7 +165,6 @@ var Renderer = function Renderer(props) {
     className: "render_wrap",
     magic_design: "",
     style: __assign({
-      height: '100%',
       background: pageBackground
     }, getRestStyle())
   }, floors.length > 0 && floors.map(function (nodeData, moduleIndex) {

package/es/utils/businessUtil.js

@@ -251,14 +251,40 @@ var newParseUrl = function newParseUrl(urlObj) {
         '/search-page': 'SEARCH_PAGE',
         '/commission': 'COMMISSION'
       };
-      params = {
-        action: 'jump',
-        params: {
-          type: map[link] || name,
-          link: link,
-          url: link
+      var typeTemp = map[link];
+
+      if (!typeTemp) {
+        if (type === _constants.urlTypeMap.FUNCTION_PAGE) {
+          params = {
+            action: 'jump',
+            params: {
+              type: 'WEBVIEW',
+              link: link,
+              url: link
+            }
+          };
+        } else if (!type) {
+          // 直接填的完整外链
+          params = {
+            action: 'jump',
+            params: {
+              type: 'NAVIGATE',
+              link: link,
+              url: link
+            }
+          };
         }
-      };
+      } else {
+        params = {
+          action: 'jump',
+          params: {
+            type: typeTemp || name,
+            link: link,
+            url: link
+          }
+        };
+      }
+
   }
 
   return {

package/lib/core/Renderer/index.js

@@ -88,19 +88,36 @@ var Renderer = function Renderer(props) {
     var filterData = [];
 
     if (pageData && pageData.childNodes && pageData.childNodes.length) {
+      var graduallySetFloors = function graduallySetFloors(data, step, interval, start) {
+        if (step === void 0) {
+          step = 5;
+        }
+
+        if (interval === void 0) {
+          interval = 200;
+        }
+
+        if (start === void 0) {
+          start = 0;
+        } // 计算这一步应该显示的最终索引
+
+
+        var end = Math.min(start + step, data.length); // 更新楼层数量
+
+        setFloors(data.slice(0, end)); // 如果还有更多楼层要显示，设置一个定时器来递归调用此函数
+
+        if (end < data.length) {
+          setTimeout(function () {
+            graduallySetFloors(data, step, interval, end);
+          }, interval);
+        }
+      };
+
       filterData = pageData.childNodes.filter(function (node) {
         return (0, _coreUtil.isActiveFloor)(node.activeTerminal);
       });
-    } // 首页组建分批渲染按5个一组
-
-
-    setFloors(filterData.slice(0, 5));
-    setTimeout(function () {
-      setFloors(filterData.slice(0, 10));
-      setTimeout(function () {
-        setFloors(filterData);
-      }, 200);
-    }, 200);
+      graduallySetFloors(filterData);
+    }
   }, [pageData]);
   (0, _react.useEffect)(function () {
     setTimeout(function () {
@@ -140,7 +157,7 @@ var Renderer = function Renderer(props) {
     }
 
     return {
-      overflow: 'auto'
+      overflow: 'hidden'
     };
   };
 
@@ -148,7 +165,6 @@ var Renderer = function Renderer(props) {
     className: "render_wrap",
     magic_design: "",
     style: __assign({
-      height: '100%',
       background: pageBackground
     }, getRestStyle())
   }, floors.length > 0 && floors.map(function (nodeData, moduleIndex) {

package/lib/utils/businessUtil.js

@@ -251,14 +251,40 @@ var newParseUrl = function newParseUrl(urlObj) {
         '/search-page': 'SEARCH_PAGE',
         '/commission': 'COMMISSION'
       };
-      params = {
-        action: 'jump',
-        params: {
-          type: map[link] || name,
-          link: link,
-          url: link
+      var typeTemp = map[link];
+
+      if (!typeTemp) {
+        if (type === _constants.urlTypeMap.FUNCTION_PAGE) {
+          params = {
+            action: 'jump',
+            params: {
+              type: 'WEBVIEW',
+              link: link,
+              url: link
+            }
+          };
+        } else if (!type) {
+          // 直接填的完整外链
+          params = {
+            action: 'jump',
+            params: {
+              type: 'NAVIGATE',
+              link: link,
+              url: link
+            }
+          };
         }
-      };
+      } else {
+        params = {
+          action: 'jump',
+          params: {
+            type: typeTemp || name,
+            link: link,
+            url: link
+          }
+        };
+      }
+
   }
 
   return {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "0.1.96",
+  "version": "0.1.99",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",