pixuireactcomponents 1.5.39 → 1.5.40

package/lib/loadlib/lib_mgr.js

@@ -18,20 +18,20 @@ var MainLibImpl = /** @class */ (function () {
     function MainLibImpl() {
     }
     MainLibImpl.prototype.load = function () {
-        console.log('loading openplatfrom');
+        console.log('component: loading openplatfrom');
         this.lib = loadlib.loadLib('openplatform');
         if (this.lib == undefined) {
-            console.log('load failed');
+            console.log('component: load failed');
         }
         else {
-            console.log('load success');
-            console.log('function table start');
+            console.log('component: load success');
+            console.log('component: function table start');
             for (var k in this.lib) {
                 if (k.startsWith('JS_')) {
                     console.log("".concat(k));
                 }
             }
-            console.log('function table end');
+            console.log('component: function table end');
         }
     };
     MainLibImpl.prototype.isLoadSuccess = function () {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pixuireactcomponents",
-    "version": "1.5.39",
+    "version": "1.5.40",
     "description": "pixui react components",
     "main": "index.js",
     "sideEffects": false,

package/src/components/react/app/virtualList/VirtualList.d.ts

@@ -69,10 +69,6 @@ interface VirtualListProps {
     touchBottomThreshold?: number;
     /** 加载更多数据的回调函数 */
     loadMore?: () => Promise<void>;
-    /** 顶部区域组件 */
-    TopArea?: h.JSX.Element;
-    /** 顶部区域尺寸 */
-    topAreaSize?: number;
     /** 滚动相关配置属性 */
     scrollProps?: VirtualListScrollProps;
 }
@@ -104,13 +100,12 @@ export declare class VirtualList extends Component<VirtualListProps, VirtualList
     protected isLoading: boolean;
     /** 视窗可见数量 */
     protected visibleCount: number;
-    /** 顶部区域高度 */
-    protected topHeight: number;
     constructor(props: VirtualListProps);
     componentDidMount(): void;
     shouldComponentUpdate(nextProps: Readonly<VirtualListProps>, nextState: Readonly<VirtualListState>, nextContext: any): boolean;
     componentWillReceiveProps(nextProps: Readonly<VirtualListProps>): void;
     onScroll: (e: Event) => void;
+    private HandleScrollProps;
     render(): h.JSX.Element;
 }
 export {};

package/src/components/react/app/virtualList/VirtualList.js

@@ -104,8 +104,7 @@ var VirtualList = /** @class */ (function (_super) {
             height: props.itemSize,
             width: props.width,
         };
-        _this.topHeight = _this.props.topAreaSize || 0;
-        _this.listHeight = props.itemCount * props.itemSize + _this.topHeight;
+        _this.listHeight = props.itemCount * props.itemSize;
         _this.state = {
             start: 0,
             end: 0,
@@ -132,7 +131,7 @@ var VirtualList = /** @class */ (function (_super) {
         this.itemCount = this.visibleCount;
         for (var i = 0; i < this.itemCount + this.props.cacheSize * 2; i++) {
             var ref = createRef();
-            var itemCrossSize = this.props.layout === 'horizontal' ? this.props.height : this.props.width;
+            var itemCrossSize = "100%";
             var item = {
                 vNode: (h(VirtualListItem, { layout: this.props.layout, index: i, key: i, ref: ref, itemMainSize: this.props.itemSize, itemCrossSize: itemCrossSize, child: this.props.renderItemFunc(i) })),
                 isValid: false,
@@ -153,18 +152,50 @@ var VirtualList = /** @class */ (function (_super) {
             this.setState({
                 start: 0,
                 end: Math.min(this.state.start + this.visibleCount, nextProps.itemCount),
-                listHeight: nextProps.itemCount * nextProps.itemSize + this.topHeight,
+                listHeight: nextProps.itemCount * nextProps.itemSize,
             });
             this.ref.scrollTop = 0;
             this.forceUpdate();
         }
         if (nextProps.itemCount !== this.props.itemCount) {
             this.setState({
-                listHeight: nextProps.itemCount * nextProps.itemSize + this.topHeight,
+                listHeight: nextProps.itemCount * nextProps.itemSize,
             });
             this.forceUpdate();
         }
     };
+    VirtualList.prototype.HandleScrollProps = function () {
+        var scrollProps = {
+            movementType: 'elastic',
+            scrollSensitivity: 1,
+            inertiaVersion: 2,
+            decelerationRate: 0.135,
+            staticVelocityDrag: 100,
+            frictionCoefficient: 2.0,
+        };
+        if (this.props.scrollProps) {
+            /* 兼容双问号 */
+            if (this.props.scrollProps.movementType !== null && this.props.scrollProps.movementType !== undefined) {
+                scrollProps.movementType = this.props.scrollProps.movementType;
+            }
+            if (this.props.scrollProps.scrollSensitivity !== null && this.props.scrollProps.scrollSensitivity !== undefined) {
+                scrollProps.scrollSensitivity = this.props.scrollProps.scrollSensitivity;
+            }
+            if (this.props.scrollProps.inertiaVersion !== null && this.props.scrollProps.inertiaVersion !== undefined) {
+                scrollProps.inertiaVersion = this.props.scrollProps.inertiaVersion;
+            }
+            if (this.props.scrollProps.decelerationRate !== null && this.props.scrollProps.decelerationRate !== undefined) {
+                scrollProps.decelerationRate = this.props.scrollProps.decelerationRate;
+            }
+            if (this.props.scrollProps.staticVelocityDrag !== null && this.props.scrollProps.staticVelocityDrag !== undefined) {
+                scrollProps.staticVelocityDrag = this.props.scrollProps.staticVelocityDrag;
+            }
+            if (this.props.scrollProps.frictionCoefficient !== null && this.props.scrollProps.frictionCoefficient !== undefined) {
+                scrollProps.frictionCoefficient = this.props.scrollProps.frictionCoefficient;
+            }
+        }
+        return scrollProps;
+    };
     VirtualList.prototype.render = function () {
         var _this = this;
         var start = Math.max(0, this.state.start - this.props.cacheSize);
@@ -217,33 +248,8 @@ var VirtualList = /** @class */ (function (_super) {
                 height: "".concat(this.state.listHeight, "px"),
             };
         }
-        /* 兼容双问号 */
-        var movementType = 'elastic';
-        if (this.props.scrollProps && this.props.scrollProps.movementType !== null && this.props.scrollProps.movementType !== undefined) {
-            movementType = this.props.scrollProps.movementType;
-        }
-        var scrollSensitivity = 1;
-        if (this.props.scrollProps && this.props.scrollProps.scrollSensitivity !== null && this.props.scrollProps.scrollSensitivity !== undefined) {
-            scrollSensitivity = this.props.scrollProps.scrollSensitivity;
-        }
-        var inertiaVersion = 2;
-        if (this.props.scrollProps && this.props.scrollProps.inertiaVersion !== null && this.props.scrollProps.inertiaVersion !== undefined) {
-            inertiaVersion = this.props.scrollProps.inertiaVersion;
-        }
-        var decelerationRate = 0.135;
-        if (this.props.scrollProps && this.props.scrollProps.decelerationRate !== null && this.props.scrollProps.decelerationRate !== undefined) {
-            decelerationRate = this.props.scrollProps.decelerationRate;
-        }
-        var staticVelocityDrag = 100;
-        if (this.props.scrollProps && this.props.scrollProps.staticVelocityDrag !== null && this.props.scrollProps.staticVelocityDrag !== undefined) {
-            staticVelocityDrag = this.props.scrollProps.staticVelocityDrag;
-        }
-        var frictionCoefficient = 2.0;
-        if (this.props.scrollProps && this.props.scrollProps.frictionCoefficient !== null && this.props.scrollProps.frictionCoefficient !== undefined) {
-            frictionCoefficient = this.props.scrollProps.frictionCoefficient;
-        }
-        return (h("div", { key: "VirtualListRoot", id: 'VirtualListRoot', "movement-type": movementType, "scroll-sensitivity": scrollSensitivity, "inertia-version": inertiaVersion, "deceleration-rate": decelerationRate, "static-velocity-drag": staticVelocityDrag, "friction-coefficient": frictionCoefficient, ref: this.ref, onScroll: this.onScroll, style: __assign({ position: 'relative', overflow: 'scroll', flexDirection: this.props.layout === 'horizontal' ? 'row' : 'column', width: this.props.width, height: this.props.height }, this.props.style) },
-            this.props.TopArea,
+        var scrollProps = this.HandleScrollProps();
+        return (h("div", { key: "VirtualListRoot", id: 'VirtualListRoot', className: 'VirtualListRoot', "movement-type": scrollProps.movementType, "scroll-sensitivity": scrollProps.scrollSensitivity, "inertia-version": scrollProps.inertiaVersion, "deceleration-rate": scrollProps.decelerationRate, "static-velocity-drag": scrollProps.staticVelocityDrag, "friction-coefficient": scrollProps.frictionCoefficient, ref: this.ref, onScroll: this.onScroll, style: __assign({ position: 'relative', overflow: 'scroll', flexDirection: this.props.layout === 'horizontal' ? 'row' : 'column', width: this.props.width, height: this.props.height }, this.props.style) },
             h("div", { key: "VirtualList", id: 'VirtualList', style: VirtualListStyle }, this.itemCache.map(function (item) { return item.vNode; }))));
     };
     return VirtualList;

package/src/components/tools/assetCache.js

@@ -37,8 +37,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 import { sha1 } from './Sha1';
 import { LibMgr } from '../../../lib/loadlib/lib_mgr';
 var assetPrefix = 'cacheAsset';
-var OPLib = LibMgr.getInstance().getMainLib();
-console.log('new lib test');
 /**
  * 缓存资源到本地，仅jssdk环境可用
  */
@@ -54,8 +52,10 @@ export var assetCache;
     assetCache.cache = function (url, force, retryTimes) {
         if (retryTimes === void 0) { retryTimes = 3; }
         return __awaiter(_this, void 0, void 0, function () {
+            var OPLib;
             var _this = this;
             return __generator(this, function (_a) {
+                OPLib = LibMgr.getInstance().getMainLib();
                 console.log('cacheAsset---', url);
                 return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
                         var urlWithoutParams, localPath, xhr;
@@ -139,6 +139,7 @@ export var assetCache;
         });
     };
     assetCache.getFileCachePath = function (url) {
+        var OPLib = LibMgr.getInstance().getMainLib();
         console.log('getCachePath', url);
         if (!OPLib.isLoadSuccess()) {
             console.log('非jssdk环境');
@@ -203,6 +204,7 @@ export var assetCache;
         });
     };
     var getLocalPath = function (url) {
+        var OPLib = LibMgr.getInstance().getMainLib();
         console.log('getLocalPath', url);
         var cachePath = OPLib.getCachePath();
         if (!cachePath) {