pixuireactcomponents 1.4.6 → 1.4.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pixuireactcomponents",
-    "version": "1.4.6",
+    "version": "1.4.7",
     "description": "pixui react components",
     "main": "index.js",
     "scripts": {

package/src/components/react/app/loadChecker/LoadChecker.d.ts

@@ -4,4 +4,6 @@ export declare const LoadChecker: (props: {
     rootClass?: string | undefined;
     timeoutPeriod?: number | undefined;
     onLoad?: Function | undefined;
+    enableCompLog?: boolean | undefined;
+    onlyHttp?: boolean | undefined;
 }) => h.JSX.Element;

package/src/components/react/app/loadChecker/LoadChecker.js

@@ -10,20 +10,32 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 import h from 'lib/dom';
 import { useEffect, useRef, useState } from 'preact/hooks';
 export var LoadChecker = function (props) {
-    var children = props.children, _a = props.rootClass, rootClass = _a === void 0 ? '' : _a, _b = props.timeoutPeriod, timeoutPeriod = _b === void 0 ? 500 : _b, onLoad = props.onLoad;
-    var _c = useState(false), loaded = _c[0], setLoaded = _c[1];
-    var _d = useState(false), collectFinish = _d[0], setCollectFinish = _d[1];
-    var _e = useState([]), loadedElements = _e[0], setLoadedElements = _e[1];
-    var _f = useState([]), collectSrcs = _f[0], setCollectSrcs = _f[1];
+    var children = props.children, _a = props.rootClass, rootClass = _a === void 0 ? '' : _a, _b = props.timeoutPeriod, timeoutPeriod = _b === void 0 ? 500 : _b, onLoad = props.onLoad, _c = props.enableCompLog, enableCompLog = _c === void 0 ? false : _c, _d = props.onlyHttp, onlyHttp = _d === void 0 ? false : _d;
+    var _e = useState(false), loaded = _e[0], setLoaded = _e[1];
+    var _f = useState(false), collectFinish = _f[0], setCollectFinish = _f[1];
+    var _g = useState([]), loadedElements = _g[0], setLoadedElements = _g[1];
+    var _h = useState([]), collectSrcs = _h[0], setCollectSrcs = _h[1];
+    var _j = useState(new Date().getTime()), timeStamp = _j[0], setTimeStamp = _j[1];
     var ref = useRef(null);
+    var myLog = function () {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+        if (enableCompLog) {
+            console.log.apply(console, __spreadArray(['LoadChecker: '], args, false));
+        }
+    };
     //0.5s后直接显示
     useEffect(function () {
         var timer = setTimeout(function () {
             setLoaded(true);
+            myLog(timeoutPeriod, 's timeout, direct show');
         }, timeoutPeriod);
         var node = ref.current;
         if (!node) {
             setLoaded(true);
+            myLog('no root node, direct show');
             return;
         }
         getLoadCount(node);
@@ -35,7 +47,11 @@ export var LoadChecker = function (props) {
     useEffect(function () {
         if (!collectFinish)
             return;
+        myLog('elementsLoadedCount:', loadedElements.length, 'collectSrcs:', collectSrcs.length);
+        myLog('loadedElements:', loadedElements, collectSrcs);
         if (collectSrcs.length == 0 || loadedElements.length >= collectSrcs.length) {
+            myLog('all loaded, srcs:', JSON.stringify(collectSrcs, null, 2));
+            myLog('all loaded, timeStamp:', new Date().getTime() - timeStamp);
             setLoaded(true);
             onLoad && onLoad();
         }
@@ -68,6 +84,9 @@ export var LoadChecker = function (props) {
             if (src.startsWith('url(')) {
                 src = src.substring(4, src.length - 1);
             }
+            if (onlyHttp && (!src.startsWith('http') || src.startsWith('http://localhost'))) {
+                return '';
+            }
             return src;
         }
         return '';