@cloudbase/weda-ui 3.7.2 → 3.7.4

package/dist/web/components/form/uploader/uploader.h5.js

@@ -108,18 +108,28 @@ export function ImageUploaderH5({ title: label, maxUploadCount, maxSize = 10, ac
         return fileIdList.length < maxUploadCount;
     }, [fileIdList, single, maxUploadCount, uploading]);
     const uploadChange = async (e) => {
+        var _a, _b, _c, _d, _e, _f;
         let files = [...e.target.files];
         if (files.some((f) => f.size > maxSize * 1024 * 1024)) {
-            weui.alert(`请上传不超过 ${maxSize}M 的图片`);
+            (_b = (_a = window === null || window === void 0 ? void 0 : window.$w) === null || _a === void 0 ? void 0 : _a.utils) === null || _b === void 0 ? void 0 : _b.showToast({
+                title: `请上传不超过 ${maxSize}M 的图片`,
+                icon: 'none',
+            });
             return false;
         }
         if (files.length > finalMaxImgCount) {
             // 防止一下子选择过多文件
-            weui.alert(`最多只能上传${finalMaxImgCount}张图片，请重新选择`);
+            (_d = (_c = window === null || window === void 0 ? void 0 : window.$w) === null || _c === void 0 ? void 0 : _c.utils) === null || _d === void 0 ? void 0 : _d.showToast({
+                title: `最多只能上传${finalMaxImgCount}张图片，请重新选择`,
+                icon: 'none',
+            });
             return false;
         }
         if (fileIdList.length + files.length > finalMaxImgCount) {
-            weui.alert(`最多只能上传${finalMaxImgCount}张图片`);
+            (_f = (_e = window === null || window === void 0 ? void 0 : window.$w) === null || _e === void 0 ? void 0 : _e.utils) === null || _f === void 0 ? void 0 : _f.showToast({
+                title: `最多只能上传${finalMaxImgCount}张图片`,
+                icon: 'none',
+            });
             return false;
         }
         let shouldUploadToCos = true;

package/dist/web/components/form/uploaderFile/uploadFile.h5.js

@@ -1,6 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import * as React from 'react';
-import weui from '../../../utils/weui';
 import isObjectEqual from '../../../utils/isObjectEqual';
 import { ConfigProvider, Button, Text, List, Progress, Tooltip, } from 'tea-component';
 import { filterStrList, isCloudFileID, isHttpFileID, transSize, transFileCloudidToName, randomStr, isInIde, isWebInMiniprogram, transFileName, } from '../../../utils/platform';
@@ -133,23 +132,36 @@ events = emptyObject, defaultValue, uploadPath = 'weda-uploader', single = true,
                 events,
                 fileSizeObj,
             }, children: _jsx("div", { "data-testid": "uploadFileH5", className: cls, id: id, style: style, children: _jsxs("div", { className: classNames(`${CLASS_PREFIX}`), children: [isEdit && (_jsx("div", { className: classNames(`${CLASS_PREFIX}__hd`, layout), children: _jsx("div", { children: btnDisabled ? (readOnly ? null : (_jsx(WdButton, { variant: "outline", className: classNames(`${CLASS_PREFIX}__btn--weak`), disabled: btnDisabled, text: btnTitle }))) : (_jsxs("div", { children: [_jsx("input", { id: "uploaderInput", type: "file", "data-testid": "button-up", className: "weui-uploader-mobile__input", accept: accepts.join(','), multiple: !single, onChange: async (e) => {
+                                                var _a, _b, _c, _d, _e, _f, _g, _h;
                                                 let fileList = [...e.target.files];
                                                 if (single && fileList.length > 1) {
-                                                    weui.alert(`上传文件总数不能超过1个`);
+                                                    (_b = (_a = window === null || window === void 0 ? void 0 : window.$w) === null || _a === void 0 ? void 0 : _a.utils) === null || _b === void 0 ? void 0 : _b.showToast({
+                                                        title: `上传文件总数不能超过1个`,
+                                                        icon: 'none',
+                                                    });
                                                     return false;
                                                 }
                                                 if (fileList.length + fileIDList.length >
                                                     maxUploadCount) {
-                                                    weui.alert(`上传文件总数不能超过${maxUploadCount}个`);
+                                                    (_d = (_c = window === null || window === void 0 ? void 0 : window.$w) === null || _c === void 0 ? void 0 : _c.utils) === null || _d === void 0 ? void 0 : _d.showToast({
+                                                        title: `上传文件总数不能超过${maxUploadCount}个`,
+                                                        icon: 'none',
+                                                    });
                                                     return false;
                                                 }
                                                 if (maxSizeLimit &&
                                                     fileList.some((f) => f.size > maxSizeLimit * 1024 * 1024)) {
-                                                    weui.alert(`请上传不超过${maxSizeLimit}M的文件`);
+                                                    (_f = (_e = window === null || window === void 0 ? void 0 : window.$w) === null || _e === void 0 ? void 0 : _e.utils) === null || _f === void 0 ? void 0 : _f.showToast({
+                                                        title: `请上传不超过${maxSizeLimit}M的文件`,
+                                                        icon: 'none',
+                                                    });
                                                     return false;
                                                 }
                                                 if (fileList.some((f) => f.size > 1024 * 1024 * 1024)) {
-                                                    weui.alert(`请上传不超过1024M的文件`);
+                                                    (_h = (_g = window === null || window === void 0 ? void 0 : window.$w) === null || _g === void 0 ? void 0 : _g.utils) === null || _h === void 0 ? void 0 : _h.showToast({
+                                                        title: `请上传不超过1024M的文件`,
+                                                        icon: 'none',
+                                                    });
                                                     return false;
                                                 }
                                                 let shouldUploadToCos = true;

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

@@ -98,6 +98,7 @@ export default React.forwardRef(function ListView(props, ref) {
             (_a = observeRef.current) === null || _a === void 0 ? void 0 : _a.disconnect();
             clearContext();
         };
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
     // 监听更改数据源时，清空当前列表
     useEffect(() => {
@@ -240,7 +241,9 @@ export default React.forwardRef(function ListView(props, ref) {
                     clearTimeout(delayRef.current.statusTimer);
                     delayRef.current.statusTimer = null;
                 }
-                delayRef.current.statusTimer = window.setTimeout(statusCb, pagination === 'bottomLoad' ? 3000 : 150);
+                delayRef.current.statusTimer = window.setTimeout(statusCb, pagination === 'bottomLoad' && dataSourceType === 'expression'
+                    ? 3000
+                    : 150);
             }
             else {
                 statusCb();

package/dist/web/components/navigationBar/common.js

@@ -39,7 +39,7 @@ export const MenuLogo = React.memo(function MenuLogo({ navigationStyle, classNam
 });
 // icon回显
 export const IconShow = ({ onIcon, menuColor, menuFontSize }) => {
-    return (_jsx(_Fragment, { children: (onIcon === null || onIcon === void 0 ? void 0 : onIcon.includes('td:')) ? (_jsx(IconFont, { name: onIcon === null || onIcon === void 0 ? void 0 : onIcon.split(':')[1], className: `${CLASS_PREFIX}__fonticon`, style: { color: menuColor, fontSize: menuFontSize } })) : (_jsx("div", { className: `${CLASS_PREFIX}__fonticon lcap-icon lcap-icon-${onIcon}`, style: { color: menuColor, fontSize: menuFontSize } })) }));
+    return (_jsx(_Fragment, { children: (onIcon === null || onIcon === void 0 ? void 0 : onIcon.includes('td:')) ? (_jsx(IconFont, { name: onIcon === null || onIcon === void 0 ? void 0 : onIcon.split(':')[1], className: `${CLASS_PREFIX}__fonticon wd-icon`, style: { color: menuColor, fontSize: menuFontSize } })) : (_jsx("div", { className: `${CLASS_PREFIX}__fonticon lcap-icon lcap-icon-${onIcon}`, style: { color: menuColor, fontSize: menuFontSize } })) }));
 };
 // 菜单图标
 export const renderMenuIcon = (iconUrl, iconPath, navigationStyle) => {

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

@@ -1,8 +1,9 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useEffect, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import classNames from '../../utils/classnames';
 import { getTempFileURL } from '../../utils/tcb';
 import { LOAD_ERR_IMG_BASE64, getWhitelist } from '../../utils/constant';
+import { getOnClick } from '../wd-unified-link/utils';
 import destr from 'destr';
 import './style';
 import xss from 'xss';
@@ -48,5 +49,16 @@ export default function RichTextView({ value = '', className, style, id, }) {
             setDisplayValue(tempValue);
         }
     }, [value]);
-    return (displayValue && (_jsx("div", { className: cls, style: style, id: id, children: _jsx("div", { dangerouslySetInnerHTML: { __html: displayValue } }) })));
+    const richTextRef = useRef(null);
+    useEffect(() => {
+        if (richTextRef.current) {
+            richTextRef.current.querySelectorAll('a').forEach((a) => {
+                a.addEventListener('click', (e) => {
+                    const url = a.href;
+                    getOnClick({ url })(e);
+                });
+            });
+        }
+    }, [displayValue]);
+    return (displayValue && (_jsx("div", { ref: richTextRef, className: cls, style: style, id: id, children: _jsx("div", { dangerouslySetInnerHTML: { __html: displayValue } }) })));
 }

package/dist/web/components/wd-code-editor/wd-code-editor.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import React, { useImperativeHandle, useMemo, useRef, useState } from 'react';
+import React, { useEffect, useImperativeHandle, useMemo, useRef, useState, } from 'react';
 import CodeMirror from '@uiw/react-codemirror';
 import classNames from '../../utils/classnames';
 import { useConfig } from '../../utils/config-context';
@@ -50,16 +50,28 @@ export const WdCodeEditor = React.forwardRef(function WdCodeEditor(props, ref) {
     useSetWidgetApi(() => ({
         ...innerHandle,
         value,
-        format: async () => {
+        format: async (params) => {
             try {
-                const result = await format(value);
+                let _value = value;
+                if (params.isCustomVal) {
+                    _value = params === null || params === void 0 ? void 0 : params.value;
+                }
+                const result = await format(_value);
                 onChangeForm(result);
+                return result;
             }
             catch (error) {
                 console.error(error);
             }
         },
     }), [innerHandle, onChangeForm, value], ref);
+    useEffect(() => {
+        if (events === null || events === void 0 ? void 0 : events.ready) {
+            // eslint-disable-next-line rulesdir/no-trigger-event-in-effect
+            events === null || events === void 0 ? void 0 : events.ready();
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
     const themeExtension = themeData[theme];
     const languageExtension = loadLanguage(language);
     return (visible && (_jsx(WdFormItem, { ...props, validateErrorMsg: validateErrorMsg, validateState: validateState, readOnly: false, disabled: disabled, readValue: value, classRoot: classRoot, inputId: inputId, layout: props.layout, children: _jsx("div", { className: cls, ref: wrapRef, onFocus: () => wrapRef.current.classList.add('is-focused'), onBlur: () => wrapRef.current.classList.remove('is-focused'), "data-color-mode": theme, children: _jsxs("div", { className: `${root}__content`, "data-testid": "wd-code-editor", children: [_jsx(CodeMirror, { value: value, height: height, extensions: [languageExtension], onChange: onChange, placeholder: placeholder, editable: !readOnly && !disabled, autoFocus: focus, theme: themeExtension }), _jsx("textarea", { id: inputId, ref: textareaRef, placeholder: placeholder, name: name, value: value, autoFocus: focus, disabled: disabled, readOnly: readOnly, onChange: onChange, spellCheck: false, ...startWithOnProps })] }) }) })));

package/dist/web/components/wd-table/utils/index.js

@@ -185,7 +185,7 @@ const getSearchValues = (searchValues) => {
     });
 };
 const getPageParam = ({ defaultSort, sort: _sort, params, _defaultPageSize, _defaultPageIndex, supportManyRelated, columns, isSupportMultipleSort, }) => {
-    let sort = defaultSort;
+    let sort = defaultSort || [];
     // 运行态有值，以运行态为准
     if ((_sort === null || _sort === void 0 ? void 0 : _sort.length) && _sort[0].order) {
         params.orderBy = _sort[0].by;
@@ -193,7 +193,7 @@ const getPageParam = ({ defaultSort, sort: _sort, params, _defaultPageSize, _def
         sort = _sort;
     }
     // 后端根据业务字段排序
-    sort = sort.map((n) => {
+    sort = sort === null || sort === void 0 ? void 0 : sort.map((n) => {
         var _a;
         return ({
             ...n,

package/dist/web/components/wd-unified-link/index.js

@@ -2,12 +2,13 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { forwardRef } from 'react';
 import { ConfigProvider } from 'tea-component';
 import { useConfig } from '../../utils/config-context';
-import { usePlatform, alertErrorMessage } from '../../utils/platform';
+import { usePlatform } from '../../utils/platform';
 import classNames from '../../utils/classnames';
 import { useSetWidgetApi } from '../../utils/widget-api/use-set-widget-api';
+import { getOnClick } from './utils';
 import '../style';
 export const WdUnifiedLink = forwardRef(function WdUnifiedLink(props, ref) {
-    const { className, id, style, children, url, options, events } = props;
+    const { className, id, style, children, url, options } = props;
     const platform = usePlatform();
     // 样式
     const { classPrefix } = useConfig();
@@ -19,73 +20,13 @@ export const WdUnifiedLink = forwardRef(function WdUnifiedLink(props, ref) {
         [compClassName]: true,
         [platformCss]: true,
     };
-    const isMobile = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|IEMobile)/i);
     // Widget API，挂载组件只读属性和组件方法
     useSetWidgetApi(() => ({
         url,
         options,
     }), [url, options], ref);
     // 方法
-    const onClick = async (e) => {
-        var _a, _b, _c, _d, _e;
-        events.tap && events.tap({}, { originEvent: e });
-        // a 标签直接跳转
-        if (/https?:\/\//.test(url)) {
-            return;
-        }
-        if (!e.defaultPrevented) {
-            e.preventDefault();
-            const URL_REG = /^(weda-page|plugin|miniprogram):\/\/([0-9.\-A-Za-z]+)(?:\/([^?#]*))?(?:\?([^#]*))?$/;
-            const matched = url.match(URL_REG);
-            if (matched) {
-                // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                const [_, protocol, ...restOpts] = matched;
-                switch (protocol) {
-                    case 'plugin':
-                        alertErrorMessage({
-                            message: '仅支持在小程序端打开插件页面',
-                        });
-                        break;
-                    case 'weda-page': {
-                        const [packageName, pageId, query] = restOpts;
-                        let params = {};
-                        if (query) {
-                            params = query.split('&').reduce((acc, param) => {
-                                const [key, value] = param.split('=');
-                                acc[key] = value;
-                                return acc;
-                            }, {});
-                        }
-                        // 页面参数，如果存在变量绑定，以绑定值为准
-                        if ((_a = props === null || props === void 0 ? void 0 : props.params) === null || _a === void 0 ? void 0 : _a[pageId]) {
-                            params = { ...params, ...(_b = props === null || props === void 0 ? void 0 : props.params) === null || _b === void 0 ? void 0 : _b[pageId] };
-                        }
-                        (_c = window === null || window === void 0 ? void 0 : window.app) === null || _c === void 0 ? void 0 : _c.navigateTo({
-                            pageId,
-                            packageName: packageName === 'main' ? '' : packageName,
-                            mode: (options === null || options === void 0 ? void 0 : options.target) === '_blank' ? 'web' : 'weDa',
-                            params,
-                        });
-                        break;
-                    }
-                    case 'miniprogram':
-                        // 打开其他小程序
-                        if (!isMobile) {
-                            alertErrorMessage({
-                                message: '仅支持在移动端打开小程序页面',
-                            });
-                        }
-                        else {
-                            (_d = window === null || window === void 0 ? void 0 : window.app) === null || _d === void 0 ? void 0 : _d.navigateTo({ url, options });
-                        }
-                        break;
-                    default:
-                        (_e = window === null || window === void 0 ? void 0 : window.app) === null || _e === void 0 ? void 0 : _e.navigateTo({ url, options });
-                        break;
-                }
-            }
-        }
-    };
+    const onClick = getOnClick(props);
     return (_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsx("a", { href: /https?:\/\//.test(url) ? url : 'javascript:void(0);', rel: "noopener noreferrer", className: classNames(classes, className), id: id, style: style, onClick: onClick, "data-testid": "wd-unified-link", ...options, children: children }) }));
 });
 export default WdUnifiedLink;

package/dist/web/components/wd-unified-link/utils.d.ts

@@ -0,0 +1 @@
+export declare const getOnClick: (props: any) => (e: any) => Promise<void>;

package/dist/web/components/wd-unified-link/utils.js

@@ -0,0 +1,66 @@
+import { alertErrorMessage } from '../../utils/platform';
+// ! reference in src/web/components/richTextView/index.tsx
+export const getOnClick = (props) => {
+    const { url, options, events } = props;
+    const isMobile = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|IEMobile)/i);
+    return async (e) => {
+        var _a, _b, _c, _d, _e;
+        (events === null || events === void 0 ? void 0 : events.tap) && events.tap({}, { originEvent: e });
+        // a 标签直接跳转
+        if (/https?:\/\//.test(url)) {
+            return;
+        }
+        if (!e.defaultPrevented) {
+            e.preventDefault();
+            const URL_REG = /^(weda-page|plugin|miniprogram):\/\/([0-9.\-A-Za-z]+)(?:\/([^?#]*))?(?:\?([^#]*))?$/;
+            const matched = url.match(URL_REG);
+            if (matched) {
+                // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                const [_, protocol, ...restOpts] = matched;
+                switch (protocol) {
+                    case 'plugin':
+                        alertErrorMessage({
+                            message: '仅支持在小程序端打开插件页面',
+                        });
+                        break;
+                    case 'weda-page': {
+                        const [packageName, pageId, query] = restOpts;
+                        let params = {};
+                        if (query) {
+                            params = query.split('&').reduce((acc, param) => {
+                                const [key, value] = param.split('=');
+                                acc[key] = value;
+                                return acc;
+                            }, {});
+                        }
+                        // 页面参数，如果存在变量绑定，以绑定值为准
+                        if ((_a = props === null || props === void 0 ? void 0 : props.params) === null || _a === void 0 ? void 0 : _a[pageId]) {
+                            params = { ...params, ...(_b = props === null || props === void 0 ? void 0 : props.params) === null || _b === void 0 ? void 0 : _b[pageId] };
+                        }
+                        (_c = window === null || window === void 0 ? void 0 : window.app) === null || _c === void 0 ? void 0 : _c.navigateTo({
+                            pageId,
+                            packageName: packageName === 'main' ? '' : packageName,
+                            mode: (options === null || options === void 0 ? void 0 : options.target) === '_blank' ? 'web' : 'weDa',
+                            params,
+                        });
+                        break;
+                    }
+                    case 'miniprogram':
+                        // 打开其他小程序
+                        if (!isMobile) {
+                            alertErrorMessage({
+                                message: '仅支持在移动端打开小程序页面',
+                            });
+                        }
+                        else {
+                            (_d = window === null || window === void 0 ? void 0 : window.app) === null || _d === void 0 ? void 0 : _d.navigateTo({ url, options });
+                        }
+                        break;
+                    default:
+                        (_e = window === null || window === void 0 ? void 0 : window.app) === null || _e === void 0 ? void 0 : _e.navigateTo({ url, options });
+                        break;
+                }
+            }
+        }
+    };
+};

package/dist/web/utils/constant.js

@@ -226,7 +226,11 @@ export const getWhitelist = () => {
         onTagAttr: function (tag, name, value) {
             if (((tag === 'img' && name === 'src') ||
                 (tag === 'a' && name === 'href')) &&
-                /^((http)|(https)|(cloud)|(mailto)|(ftp)|(tel)):/.test(value)) {
+                // Prettier -> 单行过长 分行处理
+                [
+                    /^((http)|(https)|(cloud)|(mailto)|(ftp)|(tel)):/,
+                    /^((weda-page)|(miniprogram)|(plugin)):/,
+                ].some((reg) => reg.test(value))) {
                 return `${name}="${value}"`;
             }
             if (name === 'style') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/weda-ui",
-  "version": "3.7.2",
+  "version": "3.7.4",
   "main": "./dist/index.js",
   "module": "./dist/index",
   "miniprogram": "mpdist",