pixuireactcomponents 1.5.34 → 1.5.36

package/lib/loadlib/lib_mgr.d.ts

@@ -4,6 +4,7 @@ export declare function singleton<T>(impl: new () => T): {
 declare class MainLibImpl {
     private lib;
     load(): void;
+    isLoadSuccess(): boolean;
     unload(): void;
     stringToArrayBuffer(content: string): ArrayBuffer;
     getPlatform(): number;

package/lib/loadlib/lib_mgr.js

@@ -34,6 +34,9 @@ var MainLibImpl = /** @class */ (function () {
             console.log('function table end');
         }
     };
+    MainLibImpl.prototype.isLoadSuccess = function () {
+        return this.lib != undefined;
+    };
     MainLibImpl.prototype.unload = function () {
         loadlib.unloadLib('openplatform');
         this.lib = undefined;

package/package.json

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

package/src/components/react/app/carousel/Carousel.js

@@ -167,6 +167,8 @@ export function Carousel(props) {
         };
     }, []);
     var handlePrev = function () {
+        if (!loop && showIndex == 1)
+            return;
         if (isMoving.current)
             return;
         isMoving.current = true;
@@ -244,7 +246,38 @@ export function Carousel(props) {
         var b = rect.bottom;
         var x = e.clientX;
         var y = e.clientY;
-        setGestureoffset([e.clientX - mouseDownX.current, e.clientY - mouseDownY.current]);
+        //loop=false时，首尾元素不能继续往外滑动
+        if (loop == false) {
+            if (showIndex == 1) {
+                if (!isVertical) {
+                    if (x - mouseDownX.current > 0) {
+                        // console.log('stop x', x);
+                        return;
+                    }
+                }
+                else {
+                    if (y - mouseDownY.current < 0) {
+                        // console.log('stop y', y);
+                        return;
+                    }
+                }
+            }
+            else if (showIndex == carouselItems.length - 2) {
+                if (!isVertical) {
+                    if (x - mouseDownX.current < 0) {
+                        // console.log('stop x', x);
+                        return;
+                    }
+                }
+                else {
+                    if (y - mouseDownY.current < 0) {
+                        // console.log('stop y', y);
+                        return;
+                    }
+                }
+            }
+        }
+        setGestureoffset([x - mouseDownX.current, y - mouseDownY.current]);
         //计算滑动超出元素范围
         if (x < l || x > r || y > b || y < t) {
             gestureUp();

package/src/components/tools/assetCache.js

@@ -34,12 +34,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-import { GameletAPI } from 'gamelet-pixui-frame';
 import path from 'path';
 import { tools } from './tools';
 import { LibMgr } from '../../../lib/loadlib/lib_mgr';
 var assetPrefix = 'cacheAsset';
-var isJssdkEnv = GameletAPI.getRuntimeEnv() == 'jssdk-appwindow' || GameletAPI.getRuntimeEnv() == 'jssdk-preprocessor';
 var OPLib = LibMgr.getInstance().getMainLib();
 console.log('new lib test');
 /**
@@ -64,7 +62,7 @@ export var assetCache;
                         var urlWithoutParams, localPath, xhr;
                         var _this = this;
                         return __generator(this, function (_a) {
-                            if (!isJssdkEnv) {
+                            if (!OPLib.isLoadSuccess()) {
                                 console.log('非jssdk环境');
                                 reject(url);
                                 return [2 /*return*/];
@@ -143,7 +141,7 @@ export var assetCache;
     };
     assetCache.getFileCachePath = function (url) {
         console.log('getCachePath', url);
-        if (!isJssdkEnv) {
+        if (!OPLib.isLoadSuccess()) {
             console.log('非jssdk环境');
             return '';
         }