@cloud-app-dev/vidc 2.2.0-alpha.7 → 3.0.0

package/es/List/DynamicGridList/index.js

@@ -1,29 +1,36 @@
-import _useUpdateEffect from "ahooks/es/useUpdateEffect";
-import _useInfiniteScroll2 from "ahooks/es/useInfiniteScroll";
-import React, { useRef } from 'react';
+import "antd/lib/message/style";
+import _message from "antd/lib/message";
+import { __rest } from "tslib";
+import React, { useEffect, useMemo, useRef } from 'react';
 import GridList from '../GridList';
+import useInfiniteScroll from '../../useInfiniteScroll';
+
+function DynamicGridList(_a) {
+  var renderItem = _a.renderItem,
+      itemHeight = _a.itemHeight,
+      itemKey = _a.itemKey,
+      itemWidth = _a.itemWidth,
+      reloadDeps = _a.reloadDeps,
+      getGridGap = _a.getGridGap,
+      loadPage = _a.loadPage,
+      isNoMore = _a.isNoMore,
+      threshold = _a.threshold,
+      props = __rest(_a, ["renderItem", "itemHeight", "itemKey", "itemWidth", "reloadDeps", "getGridGap", "loadPage", "isNoMore", "threshold"]);
 
-function DynamicGridList(_ref) {
-  var itemKey = _ref.itemKey,
-      itemHeight = _ref.itemHeight,
-      itemWidth = _ref.itemWidth,
-      loadNextPage = _ref.loadNextPage,
-      reloadDep = _ref.reloadDep,
-      isNoMore = _ref.isNoMore,
-      renderItem = _ref.renderItem,
-      className = _ref.className,
-      getGridGap = _ref.getGridGap;
   var containerRef = useRef(null);
 
-  var _useInfiniteScroll = _useInfiniteScroll2(function (d) {
-    return loadNextPage(d);
-  }, {
+  var _useInfiniteScroll = useInfiniteScroll(loadPage, {
     target: containerRef,
-    threshold: 50,
-    isNoMore: isNoMore
+    threshold: threshold,
+    isNoMore: isNoMore,
+    reloadDeps: reloadDeps
   }),
       data = _useInfiniteScroll.data,
-      mutate = _useInfiniteScroll.mutate;
+      noMore = _useInfiniteScroll.noMore;
+
+  useEffect(function () {
+    return _message.success('数据已全部加载完成！');
+  }, [noMore]);
 
   function getItemData(data) {
     return {
@@ -41,21 +48,12 @@ function DynamicGridList(_ref) {
     return Math.round(windowHeight * 1.5);
   }
 
-  _useUpdateEffect(function () {
-    var _a;
-
-    mutate({
-      list: []
-    });
-    (_a = containerRef.current) === null || _a === void 0 ? void 0 : _a.scrollTo({
-      left: 0,
-      top: 0
-    });
-  }, [reloadDep]);
-
+  var dataList = useMemo(function () {
+    return data ? data.list || [] : [];
+  }, [data]);
   return /*#__PURE__*/React.createElement(GridList, {
-    className: "cloudapp-dynamic-grid-list ".concat(className),
-    items: (data === null || data === void 0 ? void 0 : data.list) || [],
+    className: "cloudapp-dynamic-grid-list ".concat(props.className),
+    items: dataList,
     ref: containerRef,
     getItemData: getItemData,
     getColumnCount: getColumnCount,
@@ -66,11 +64,13 @@ function DynamicGridList(_ref) {
 }
 
 DynamicGridList.defaultProps = {
-  itemWidth: 250,
-  itemHeight: 300,
+  reloadDeps: [],
   className: '',
   getGridGap: function getGridGap() {
     return 20;
-  }
+  },
+  itemHeight: 300,
+  itemWidth: 250,
+  threshold: 50
 };
 export default DynamicGridList;

package/es/List/DynamicList/index.css

@@ -0,0 +1,15 @@
+.l-c-dynamic-list-layout {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+  border: 1px solid var(--gray2);
+}
+.l-c-dynamic-list-layout .dynamic-list-item {
+  padding: 0 10px;
+}
+.l-c-dynamic-list-layout .l-c-dynamic-box {
+  flex: 1;
+  overflow: auto;
+  contain: strict;
+}

package/es/List/DynamicList/index.d.ts

@@ -0,0 +1,14 @@
+/// <reference types="react" />
+import type { IDynamicListProps } from './interface';
+import './index.less';
+declare function DynamicDeviceList<T>({ renderItem, itemHeight, itemClassName, reloadDeps, loadPage }: IDynamicListProps<T>): JSX.Element;
+declare namespace DynamicDeviceList {
+    var defaultProps: {
+        limit: number;
+        itemHeight: number;
+        params: {};
+        itemKey: string;
+        itemClassName: string;
+    };
+}
+export default DynamicDeviceList;

package/es/List/DynamicList/index.js

@@ -0,0 +1,105 @@
+import "antd/lib/skeleton/style";
+import _Skeleton from "antd/lib/skeleton";
+import _useUpdateEffect from "ahooks/es/useUpdateEffect";
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import React, { useMemo, useRef } from 'react';
+import useVirtualList from '../../useVirtualList';
+import { LIMIT, skeletonList } from './utils';
+import useInfiniteScroll from '../../useInfiniteScroll';
+import "./index.css";
+
+function DynamicDeviceList(_ref) {
+  var renderItem = _ref.renderItem,
+      itemHeight = _ref.itemHeight,
+      itemClassName = _ref.itemClassName,
+      reloadDeps = _ref.reloadDeps,
+      loadPage = _ref.loadPage;
+  var containerRef = useRef();
+  var wrapperRef = useRef();
+
+  var _useInfiniteScroll = useInfiniteScroll(loadPage, {
+    target: containerRef,
+    threshold: 50,
+    isNoMore: function isNoMore(d) {
+      var _a;
+
+      return ((_a = d === null || d === void 0 ? void 0 : d.list) === null || _a === void 0 ? void 0 : _a.length) >= (d === null || d === void 0 ? void 0 : d.count);
+    },
+    reloadDeps: reloadDeps
+  }),
+      data = _useInfiniteScroll.data,
+      loading = _useInfiniteScroll.loading,
+      noMore = _useInfiniteScroll.noMore;
+
+  var isSkeleton = useMemo(function () {
+    return !noMore && loading;
+  }, [noMore, loading]);
+  var dataList = useMemo(function () {
+    return data ? data.list || [] : [];
+  }, [data]);
+
+  var _useVirtualList = useVirtualList(dataList, {
+    containerTarget: containerRef,
+    wrapperTarget: wrapperRef,
+    itemHeight: itemHeight,
+    overscan: 10
+  }),
+      _useVirtualList2 = _slicedToArray(_useVirtualList, 2),
+      list = _useVirtualList2[0],
+      scrollTo = _useVirtualList2[1];
+
+  _useUpdateEffect(function () {
+    return scrollTo(0);
+  }, reloadDeps ? reloadDeps : []);
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: "l-c-dynamic-list-layout"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "l-c-dynamic-box",
+    ref: containerRef
+  }, /*#__PURE__*/React.createElement("div", {
+    ref: wrapperRef
+  }, list.map(function (item) {
+    return /*#__PURE__*/React.createElement("div", {
+      key: item.index,
+      style: {
+        height: itemHeight
+      },
+      className: itemClassName
+    }, renderItem(item));
+  })), isSkeleton && skeletonList.map(function (_, index) {
+    return /*#__PURE__*/React.createElement("div", {
+      key: index,
+      style: {
+        padding: '0 10px',
+        height: itemHeight
+      },
+      className: itemClassName
+    }, /*#__PURE__*/React.createElement(_Skeleton, {
+      paragraph: false,
+      loading: true,
+      active: true
+    }));
+  })));
+}
+
+DynamicDeviceList.defaultProps = {
+  limit: LIMIT,
+  itemHeight: 40,
+  params: {},
+  itemKey: 'id',
+  itemClassName: ''
+};
+export default DynamicDeviceList;

package/es/List/DynamicList/interface.d.ts

@@ -0,0 +1,19 @@
+import type { TData } from '../../useInfiniteScroll';
+export interface IDynamicListProps<T> {
+  itemHeight?: number;
+
+  itemClassName?: string;
+
+  /**
+   * 重载条件
+   */
+  reloadDeps?: any[];
+
+  /**
+   * render列表
+   * @param options
+   */
+  renderItem(options: { index: number; data: T }): JSX.Element;
+
+  loadPage(d: TData<T>): Promise<TData<T>>;
+}

package/es/List/DynamicList/utils.d.ts

@@ -0,0 +1,4 @@
+export declare const LIMIT = 30;
+export declare const skeletonList: {
+    skeleton: boolean;
+}[];

package/es/List/DynamicList/utils.js

@@ -0,0 +1,6 @@
+export var LIMIT = 30;
+export var skeletonList = Array.from(new Array(LIMIT)).map(function () {
+  return {
+    skeleton: true
+  };
+});

package/es/List/GridList/Demo.js

@@ -1,4 +1,16 @@
-import React from 'react';
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import React, { useEffect, useState } from 'react';
 import GridList from './index';
 import data from './data.json';
 var ITEM_WIDTH = 300;
@@ -20,22 +32,32 @@ function getWindowMargin(windowHeight) {
 }
 
 function getItemData(image, columnWidth) {
-  console.log(columnWidth);
   return {
     key: image.url,
     height: 400,
-    width: ITEM_WIDTH
+    width: ITEM_WIDTH,
+    url: image.url
   };
 }
 
 var App = function App() {
+  var _useState = useState([]),
+      _useState2 = _slicedToArray(_useState, 2),
+      list = _useState2[0],
+      setlist = _useState2[1];
+
+  useEffect(function () {
+    setTimeout(function () {
+      return setlist(data.data.list);
+    }, 2000);
+  }, []);
   return /*#__PURE__*/React.createElement("div", {
     style: {
       height: 800,
       overflow: 'auto'
     }
   }, /*#__PURE__*/React.createElement(GridList, {
-    items: data.data.list,
+    items: list,
     getGridGap: getGridGap,
     getColumnCount: getColumnCount,
     getWindowMargin: getWindowMargin,
@@ -55,6 +77,7 @@ var App = function App() {
         }
       }, /*#__PURE__*/React.createElement("img", {
         src: image.url,
+        alt: "",
         style: {
           objectFit: 'cover',
           display: 'block',

package/es/List/GridList/index.css

@@ -4,4 +4,5 @@
   overflow: auto;
   padding: 20px;
   contain: strict;
+  box-sizing: border-box;
 }

package/es/List/GridList/index.d.ts

@@ -11,5 +11,5 @@ export interface GridListProps<P> {
     fixedColumnWidth?: number;
     className?: string;
 }
-declare const _default: React.ForwardRefExoticComponent<GridListProps<any> & React.RefAttributes<HTMLDivElement>>;
-export default _default;
+declare const GridList: React.ForwardRefExoticComponent<GridListProps<unknown> & React.RefAttributes<HTMLDivElement>>;
+export default GridList;

package/es/List/GridList/index.js

@@ -1,21 +1,18 @@
-import React, { useRef, useImperativeHandle } from 'react';
+import React, { useRef } from 'react';
 import { useGridListConfigData, useGridListContainerData, useGridListLayoutData, useGridListRenderData, useIntersecting } from './hook';
 import { getGridRowStart } from './utils';
 import "./index.css";
-
-function GridList(props, ref) {
+var GridList = /*#__PURE__*/React.forwardRef(function GridList(props, ref) {
   var containerRef = useRef(null);
-  var containerData = useGridListContainerData(containerRef);
+  var domRef = ref !== null && ref !== void 0 ? ref : containerRef;
+  var containerData = useGridListContainerData(domRef);
   var configData = useGridListConfigData(containerData, props);
   var layoutData = useGridListLayoutData(configData);
   var renderData = useGridListRenderData(containerData, configData, layoutData);
-  var intersecting = useIntersecting(containerRef, "".concat(configData !== null ? configData.windowMargin : 0, "px"));
+  var intersecting = useIntersecting(domRef, "".concat(configData !== null ? configData.windowMargin : 0, "px"));
   var colWidth = props.fixedColumnWidth ? "".concat(props.fixedColumnWidth, "px") : '1fr';
-  useImperativeHandle(ref, function () {
-    return containerRef.current;
-  }, []);
   return /*#__PURE__*/React.createElement("div", {
-    ref: containerRef,
+    ref: domRef,
     className: "cloudapp-grid-list ".concat(props.className || '')
   }, /*#__PURE__*/React.createElement("div", {
     style: {
@@ -42,6 +39,5 @@ function GridList(props, ref) {
       }
     }, props.renderItem(cell.item, cell));
   }))));
-}
-
-export default /*#__PURE__*/React.forwardRef(GridList);
+});
+export default GridList;

package/es/List/GridList/interface.d.ts

@@ -1,4 +1,4 @@
-import React, { useRef, useMemo, useState, useEffect, RefObject, MutableRefObject } from 'react';
+import { MutableRefObject } from 'react';
 
 export type ConstRef<T> = Readonly<MutableRefObject<T>>;
 

package/es/List/VList/index.js

@@ -1,5 +1,3 @@
-import _useVirtualList3 from "ahooks/es/useVirtualList";
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -13,6 +11,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useRef } from 'react';
+import useVirtualList from '../../useVirtualList';
 import "./index.css";
 
 function VList(_ref) {
@@ -23,7 +22,7 @@ function VList(_ref) {
   var containerRef = useRef();
   var wrapperRef = useRef();
 
-  var _useVirtualList = _useVirtualList3(data, {
+  var _useVirtualList = useVirtualList(data, {
     containerTarget: containerRef,
     wrapperTarget: wrapperRef,
     itemHeight: rowHeight,

package/es/List/index.css

@@ -1,64 +1,12 @@
-.lm-c-check-list-wrapper {
+.lm-c-list-wrapper {
   display: flex;
   flex-direction: column;
   overflow: hidden;
   height: 100%;
   cursor: auto;
-  border: 1px solid var(--bd-color);
-  /*列表项*/
+  border: 1px solid var(--gray2);
 }
-.lm-c-check-list-wrapper .lm-c-base-list-layout {
+.lm-c-list-wrapper .lm-c-base-list-layout {
   flex: 1;
   overflow: hidden;
 }
-.lm-c-check-list-wrapper .list-item {
-  cursor: pointer;
-  height: 30px;
-  line-height: 30px;
-  color: var(--color);
-  font-size: var(--fs-small);
-  padding: 0 10px;
-}
-.lm-c-check-list-wrapper .list-item > label {
-  margin: 0px;
-  width: 100%;
-  display: flex;
-}
-.lm-c-check-list-wrapper .list-item .item-info {
-  flex: 1;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  cursor: pointer;
-  font-size: var(--fs-small);
-}
-.lm-c-check-list-wrapper .list-item .item-info > .anticon {
-  font-size: 16px;
-  margin: 0 4px;
-  position: relative;
-  top: 2px;
-}
-.lm-c-check-list-wrapper .list-item:hover > label,
-.lm-c-check-list-wrapper .list-item.list-item-active > label {
-  color: var(--primary);
-  border-bottom: 1px solid var(--primary);
-}
-.lm-c-check-list-wrapper .list-item.has-check-box > label {
-  padding: 0 4px;
-}
-.cloudapp-c-check-list-checkext {
-  font-size: var(--fs-small);
-  padding: 5px 15px;
-  display: flex;
-  justify-content: space-between;
-  border-bottom: 1px solid var(--bd-color);
-}
-.cloudapp-c-check-list-checkext .select-group .anticon {
-  font-size: 16px;
-  cursor: pointer;
-  padding-right: 8px;
-  color: var(--icon);
-}
-.cloudapp-c-check-list-checkext .select-group .anticon:hover {
-  color: var(--primary);
-}

package/es/List/index.d.ts

@@ -1,19 +1,18 @@
 import React from 'react';
-import { CheckListProps } from './interface';
+import { ListProps } from './interface';
 import './index.less';
-declare function List(props: CheckListProps<any>): JSX.Element;
+declare function List<T>(props: ListProps<T>): JSX.Element;
 declare namespace List {
     var defaultProps: {
         className: string;
         list: any[];
         itemKey: string;
         itemNameKey: string;
+        renderHeaderExt: () => JSX.Element;
     };
     var VList: typeof import("./VList").default;
-    var DeviceList: typeof import("./DeviceList").default;
-    var ListExt: typeof import("./ListExt").default;
-    var DynamicDeviceList: typeof import("./DynamicDeviceList").default;
-    var GridList: React.ForwardRefExoticComponent<import("./GridList").GridListProps<any> & React.RefAttributes<HTMLDivElement>>;
+    var DynamicList: typeof import("./DynamicList").default;
+    var GridList: React.ForwardRefExoticComponent<import("./GridList").GridListProps<unknown> & React.RefAttributes<HTMLDivElement>>;
     var DynamicGridList: typeof import("./DynamicGridList").default;
 }
 export default List;