@cloudbase/weda-ui 3.4.4 → 3.4.5

package/dist/web/components/listView/index.js

@@ -123,13 +123,6 @@ export default React.forwardRef(function ListView(props, ref) {
             });
         }
     }, [shouldBottomLoad]);
-    // 组件方法
-    useImperativeHandle(ref, () => ({
-        methods: {
-            deleteOne: methodDeleteOne,
-            refresh: methodRefresh,
-        },
-    }));
     // 清除延迟状态
     const clearDelay = () => {
         clearTimeout(delayRef.current.statusTimer);
@@ -158,76 +151,10 @@ export default React.forwardRef(function ListView(props, ref) {
         const { total = 0 } = dataRef.current || {};
         return pageNo * pageSize < total;
     };
-    /**
-     * 列表视图拉取数据
-     * 方法仅依赖入参和paramRef的参数
-     * isInitData: 是否初始化数据默认否, isFetchCurrent: 是否拉取当前所有数据默认否
-     */
-    const fetchData = async (param, options) => {
-        var _a;
-        const fetchVersion = (delayRef.current.version = getUuid());
-        const { isInitData, isFetchCurrent } = options || {};
-        // 合并参数并保存，useEffect 中需要比对
-        paramRef.current = {
-            ...paramRef.current,
-            ...param,
-            params: { ...paramRef.current.params, ...param === null || param === void 0 ? void 0 : param.params },
-        };
-        const { dataSourceName, methodName, params } = paramRef.current;
-        const { orderBy, orderType, pageNo, pageSize, where, connectorParams } = params || {};
-        if (!(dataSourceName && methodName))
-            return;
-        setStatus('loading');
-        let tcbParams = {};
-        // tcb分页参数
-        if (!isNil(pageNo) && !isNil(pageSize)) {
-            tcbParams['pageNo'] = pageNo;
-            tcbParams['pageSize'] = pageSize;
-        }
-        if (isModel) {
-            // tcb排序参数
-            if (orderBy && ORDERTYPE.includes(orderType)) {
-                tcbParams['orderBy'] = orderBy;
-                tcbParams['orderType'] = orderType;
-            }
-            // tcb过滤参数
-            const whereEffected = [].concat(getWhereList(where));
-            whereEffected.length > 0 && (tcbParams['where'] = whereEffected);
-        }
-        else {
-            // 内部分页参数覆盖查询入参
-            tcbParams = Object.assign({}, connectorParams, tcbParams);
-        }
-        // tcb结果和事件
-        let data = {};
-        const eventDatasource = isModel
-            ? datasource
-            : { ...bindConnectMetadata, ...connectorMethod };
-        try {
-            if (isFetchCurrent) {
-                data = await fetchDataLoop({ dataSourceName, methodName, params: tcbParams }, dataRef.current.records.length);
-            }
-            else {
-                data = await (appCloud === null || appCloud === void 0 ? void 0 : appCloud.callDataSource({
-                    dataSourceName,
-                    methodName,
-                    params: tcbParams,
-                }, true));
-            }
-            if (fetchVersion !== delayRef.current.version)
-                return;
-            isInitData && (dataRef.current = { total: 0, records: [] });
-            onEvents(data, eventDatasource);
-        }
-        catch (e) {
-            setStatus('fail');
-            (_a = events === null || events === void 0 ? void 0 : events.queryFail) === null || _a === void 0 ? void 0 : _a.call(events, { datasource: eventDatasource, data: null });
-        }
-    };
     /**
      * 循环调用接口获取当前已加载的数据
      */
-    const fetchDataLoop = async (param = {}, count = 0) => {
+    const fetchDataLoop = useCallback(async (param = {}, count = 0) => {
         let [records, total] = [[], 0];
         try {
             const { dataSourceName, methodName, params } = param || {};
@@ -248,11 +175,11 @@ export default React.forwardRef(function ListView(props, ref) {
             console.error('fetchDataLoop: ', e);
         }
         return { records: records.slice(0, count), total };
-    };
+    }, [appCloud]);
     /**
      * 根据fetchData方法返回值，回调给外部事件
      */
-    const onEvents = (data, datasource) => {
+    const onEvents = useCallback((data, datasource) => {
         var _a, _b;
         const fetchRecords = [].concat(!isRecords && !isModel ? data : (data === null || data === void 0 ? void 0 : data.records) || []);
         const total = Number(data === null || data === void 0 ? void 0 : data.total) || 0;
@@ -298,7 +225,82 @@ export default React.forwardRef(function ListView(props, ref) {
         else {
             successCb();
         }
-    };
+    }, [beforeDataChange, events, isModel, isRecords, pagination]);
+    /**
+     * 列表视图拉取数据
+     * 方法仅依赖入参和paramRef的参数
+     * isInitData: 是否初始化数据默认否, isFetchCurrent: 是否拉取当前所有数据默认否
+     */
+    const fetchData = useCallback(async (param, options) => {
+        var _a;
+        const fetchVersion = (delayRef.current.version = getUuid());
+        const { isInitData, isFetchCurrent } = options || {};
+        // 合并参数并保存，useEffect 中需要比对
+        paramRef.current = {
+            ...paramRef.current,
+            ...param,
+            params: { ...paramRef.current.params, ...param === null || param === void 0 ? void 0 : param.params },
+        };
+        const { dataSourceName, methodName, params } = paramRef.current;
+        const { orderBy, orderType, pageNo, pageSize, where, connectorParams } = params || {};
+        if (!(dataSourceName && methodName))
+            return;
+        setStatus('loading');
+        let tcbParams = {};
+        // tcb分页参数
+        if (!isNil(pageNo) && !isNil(pageSize)) {
+            tcbParams['pageNo'] = pageNo;
+            tcbParams['pageSize'] = pageSize;
+        }
+        if (isModel) {
+            // tcb排序参数
+            if (orderBy && ORDERTYPE.includes(orderType)) {
+                tcbParams['orderBy'] = orderBy;
+                tcbParams['orderType'] = orderType;
+            }
+            // tcb过滤参数
+            const whereEffected = [].concat(getWhereList(where));
+            whereEffected.length > 0 && (tcbParams['where'] = whereEffected);
+        }
+        else {
+            // 内部分页参数覆盖查询入参
+            tcbParams = Object.assign({}, connectorParams, tcbParams);
+        }
+        // tcb结果和事件
+        let data = {};
+        const eventDatasource = isModel
+            ? datasource
+            : { ...bindConnectMetadata, ...connectorMethod };
+        try {
+            if (isFetchCurrent) {
+                data = await fetchDataLoop({ dataSourceName, methodName, params: tcbParams }, dataRef.current.records.length);
+            }
+            else {
+                data = await (appCloud === null || appCloud === void 0 ? void 0 : appCloud.callDataSource({
+                    dataSourceName,
+                    methodName,
+                    params: tcbParams,
+                }, true));
+            }
+            if (fetchVersion !== delayRef.current.version)
+                return;
+            isInitData && (dataRef.current = { total: 0, records: [] });
+            onEvents(data, eventDatasource);
+        }
+        catch (e) {
+            setStatus('fail');
+            (_a = events === null || events === void 0 ? void 0 : events.queryFail) === null || _a === void 0 ? void 0 : _a.call(events, { datasource: eventDatasource, data: null });
+        }
+    }, [
+        appCloud,
+        bindConnectMetadata,
+        connectorMethod,
+        datasource,
+        events,
+        fetchDataLoop,
+        isModel,
+        onEvents,
+    ]);
     /**
      * 计算上下文对象数据
      */
@@ -311,23 +313,19 @@ export default React.forwardRef(function ListView(props, ref) {
     /**
      * 组件刷新方法，重新初始化
      */
-    const methodRefreshFromStart = async () => {
+    const methodRefreshFromStart = useCallback(async () => {
         try {
             clearDelay();
             await fetchData({ params: { pageNo: 1 } }, { isInitData: true });
-            alertErrorMessage({
-                message: LISTVIEW_MESSAGE.refresh_success,
-                icon: 'success',
-            });
         }
         catch (e) {
             alertErrorMessage({ message: LISTVIEW_MESSAGE.refresh_fail });
         }
-    };
+    }, [fetchData]);
     /**
      * 组件刷新当前方法，保持当前已加载的数据列表状态
      */
-    const methodRefreshKeepPage = async () => {
+    const methodRefreshKeepPage = useCallback(async () => {
         try {
             clearDelay();
             const { pageNo, pageSize } = paramRef.current.params;
@@ -342,30 +340,26 @@ export default React.forwardRef(function ListView(props, ref) {
             else {
                 await methodRefreshFromStart();
             }
-            alertErrorMessage({
-                message: LISTVIEW_MESSAGE.refresh_success,
-                icon: 'success',
-            });
         }
         catch (e) {
             alertErrorMessage({ message: LISTVIEW_MESSAGE.refresh_fail });
         }
-    };
+    }, [fetchData, methodRefreshFromStart, pagination]);
     /**
      * 组件刷新方法，通过类别区分
      */
-    const methodRefresh = (params) => {
+    const methodRefresh = useCallback((params) => {
         if (typeof params === 'object' && (params === null || params === void 0 ? void 0 : params.type) === 'refreshKeepPage') {
             methodRefreshKeepPage();
         }
         else {
             methodRefreshFromStart();
         }
-    };
+    }, [methodRefreshFromStart, methodRefreshKeepPage]);
     /**
      * 组件删除单条方法
      */
-    const methodDeleteOne = async (params) => {
+    const methodDeleteOne = useCallback(async (params) => {
         try {
             if (!isModel) {
                 return alertErrorMessage({
@@ -385,15 +379,18 @@ export default React.forwardRef(function ListView(props, ref) {
                 params: { _id },
             }));
             await methodRefreshKeepPage();
-            alertErrorMessage({
-                message: LISTVIEW_MESSAGE.deleteOne_success,
-                icon: 'success',
-            });
         }
         catch (e) {
             alertErrorMessage({ message: LISTVIEW_MESSAGE.deleteOne_fail });
         }
-    };
+    }, [appCloud, isModel, methodRefreshKeepPage]);
+    // 组件方法
+    useImperativeHandle(ref, () => ({
+        methods: {
+            deleteOne: methodDeleteOne,
+            refresh: methodRefresh,
+        },
+    }), [methodDeleteOne, methodRefresh]);
     /**
      * 分页，加载更多
      */

package/dist/web/components/richTextView/index.css

@@ -1,5 +1,7 @@
 .weda-RichTextView {
   font-size: 14px;
+  word-wrap: break-word;
+  word-break: break-all;
 }
 .weda-RichTextView blockquote {
   margin: 0 0 10px;

package/dist/web/components/swiper/index.js

@@ -6,6 +6,7 @@ import { useDebouncedCallback, useEventListener, useResizeObserver, } from '@rea
 import './index.css';
 import { emptyObject } from '../../utils/constant';
 export default function Swiper({ children, className, style, autoplay = true, circular = true, vertical = false, indicatorDots, indicatorColor = 'rgba(200, 200, 200, 0.9)', indicatorActiveColor = 'rgba(0, 0, 0, 0.9)', duration = 500, interval = 5000, current = 0, events = emptyObject, id, }) {
+    var _a;
     const originChildrenRef = useRef(null);
     const [realChildren, setRealChildren] = useState([]);
     const itemCount = React.Children.count(realChildren);
@@ -15,14 +16,19 @@ export default function Swiper({ children, className, style, autoplay = true, ci
     const [height, setHeight] = useState(0);
     const { change = () => { } } = events;
     useEffect(() => {
-        const realChildren = Array.from(originChildrenRef.current.children).map((elem) => {
-            const reactFiberProp = Object.keys(elem).find((prop) => prop.startsWith('__reactInternalInstance'));
-            const reactFiber = elem[reactFiberProp];
-            const reactElem = React.createElement(reactFiber.elementType, reactFiber.pendingProps);
-            return reactElem;
-        });
-        setRealChildren(realChildren);
-    }, [children]);
+        // 等待dom渲染完成
+        // eslint-disable-next-line rulesdir/no-timer
+        const timer = setTimeout(() => {
+            const realChildren = Array.from(originChildrenRef.current.children).map((elem) => {
+                const reactFiberProp = Object.keys(elem).find((prop) => prop.startsWith('__reactInternalInstance'));
+                const reactFiber = elem[reactFiberProp];
+                const reactElem = React.createElement(reactFiber.elementType, reactFiber.pendingProps);
+                return reactElem;
+            });
+            setRealChildren(realChildren);
+        }, 0);
+        return () => clearTimeout(timer);
+    }, [(_a = originChildrenRef.current) === null || _a === void 0 ? void 0 : _a.children, children]);
     useEffect(() => {
         if (autoplay) {
             // 自动切换

package/dist/web/components/table/BaseTable.js

@@ -422,7 +422,7 @@ export const BaseTable = (props) => {
             connectorParamsRef.current = connectorParams;
         }
     }, [connectorParams]);
-    // 移动端和自定义APIs场景不支持导入功能，监听变化存到表格上下文中
+    // 移动端和APIs场景不支持导入功能，监听变化存到表格上下文中
     useEffect(() => {
         handleContext({ state: { isH5, isModel } });
     }, [isH5, isModel]);
@@ -661,7 +661,7 @@ export const BaseTable = (props) => {
             // 刷新表格(查看当前页数据)
             refreshKeepPage: () => fetchData({ searchValues, pageSize, pageNo: pageIndex }),
         },
-    }));
+    }), [pageIndex, pageSize, searchValues, selectedKeys, records]);
     // 表格选中事件
     const handleRowsSelect = (keys) => {
         if (events === null || events === void 0 ? void 0 : events.rowsSelect) {
@@ -975,7 +975,7 @@ export const BaseTable = (props) => {
             return slotRender(slots.globalButton);
         }
         else if (enableGlobalButton === undefined) {
-            // 移动端和自定义APIs场景不支持导入功能
+            // 移动端和APIs场景不支持导入功能
             const buttonsList = isH5 || !isModel
                 ? buttons.filter((i) => i.action !== 'import')
                 : buttons;

package/dist/web/utils/hooks/use-cloud-id-temp-url.js

@@ -1,8 +1,9 @@
 import useSWR from 'swr';
 import { getTempFileURL } from '../tcb';
+import { transFileCloudidToName } from '../platform';
 export function useTempUrl(cloudId) {
     const prefix = 'tcb:cloud-id:temp-url';
-    const key = `${prefix}:${cloudId}`;
+    const key = `${prefix}:${transFileCloudidToName(cloudId)}`;
     return useSWR(key, async () => {
         if (!(cloudId === null || cloudId === void 0 ? void 0 : cloudId.startsWith('cloud://'))) {
             return cloudId;

package/dist/web/utils/platform.js

@@ -152,7 +152,7 @@ export const isWXIDE = () => /wechatideplugin/i.test(navigator.userAgent);
 export const resolveStaticResourceUrl = (path) => {
     var _a, _b;
     try {
-        // eslint-disable-next-line no-unsafe-optional-chaining
+        // eslint-disable-next-line no-unsafe-optional-chaining, prettier/prettier
         const resourceUrl = (_b = (_a = window === null || window === void 0 ? void 0 : window.app) === null || _a === void 0 ? void 0 : _a.__internal__) === null || _b === void 0 ? void 0 : _b.resolveStaticResourceUrl(path);
         return resourceUrl;
     }
@@ -349,3 +349,11 @@ export const getUserInfo = () => {
 export const isSupportLoading = () => {
     return 'loading' in HTMLImageElement.prototype;
 };
+/**
+ * 判断web是否被小程序嵌套
+ */
+export const isWebInMiniprogram = () => {
+    var ua = navigator.userAgent.toLowerCase();
+    return ((ua.match(/micromessenger/i) && ua.match(/miniprogram/i)) ||
+        window['__wxjs_environment'] === 'miniprogram');
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/weda-ui",
-  "version": "3.4.4",
+  "version": "3.4.5",
   "main": "./dist/index.js",
   "module": "./dist/index",
   "miniprogram": "mpdist",
@@ -61,7 +61,7 @@
   "license": "MIT",
   "description": "腾讯云微搭低代码组件库模板",
   "dependencies": {
-    "@antv/g6": "3.8.5",
+    "@antv/g6": "^4.8.5",
     "@loadable/component": "^5.15.2",
     "@react-hookz/web": "^14.2.2",
     "@sinclair/typebox": "^0.25.3",
@@ -85,7 +85,7 @@
     "react-infinite-scroll-component": "6.1.0",
     "react-vant": "3.0.0-rc.7",
     "spark-md5": "^3.0.2",
-    "swr": "^1.3.0",
+    "swr": "^2.0.3",
     "tdesign-icons-react": "0.0.8",
     "tea-component": "^2.7.8",
     "uuid": "8.3.2",