@cloudbase/weda-ui 3.1.7 → 3.1.9

package/dist/configs/components/chart/bar.json

@@ -304,7 +304,8 @@
                         "target": "*(xIsCountEmpty)",
                         "condition": "{{ $self.value && ($self.value.format !=='datetime' && $self.value.format !=='date') }}"
                     }
-                ]
+                ],
+                "remarks": "X轴数值字段选择"
             },
             "xStatistics": {
                 "title": "统计维度",
@@ -344,7 +345,8 @@
                         "target": "*(groupKey)",
                         "condition": "{{ (!$self.value || !$self.value.numValue || $self.value.numValue.length<=1) && !!$self.__datasourceName }}"
                     }
-                ]
+                ],
+                "remarks": "Y轴数值字段选择"
             },
             "groupKey": {
                 "type": "object",
@@ -584,7 +586,8 @@
                 "title": "显示数值",
                 "type": "boolean",
                 "x-index": 310,
-                "default": true
+                "default": true,
+                "remarks": "数值(Y轴)显示数值"
             },
             "dataTagShow": {
                 "x-index": 320,
@@ -597,7 +600,8 @@
                 "title": "显示数值",
                 "type": "boolean",
                 "x-index": 330,
-                "default": true
+                "default": true,
+                "remarks": "数据标签显示数值"
             },
             "unitShow": {
                 "x-index": 340,

package/dist/configs/components/chart/line.json

@@ -247,7 +247,8 @@
                         "target": "*(xIsCountEmpty)",
                         "condition": "{{ $self.value && ($self.value.format !=='datetime' && $self.value.format !=='date') }}"
                     }
-                ]
+                ],
+                "remarks": "X轴数值字段选择"
             },
             "xStatistics": {
                 "title": "统计维度",
@@ -286,7 +287,8 @@
                         "condition": "{{ (!$self.value || !$self.value.numValue || $self.value.numValue.length<=1) && !!$self.__datasourceName }}"
                     }
                 ],
-                "x-datasource-method-reset": {}
+                "x-datasource-method-reset": {},
+                "remarks": "Y轴数值字段选择"
             },
             "groupKey": {
                 "type": "object",
@@ -530,7 +532,8 @@
                 "type": "boolean",
                 "x-index": 300,
                 "default": true,
-                "x-category": "高级属性"
+                "x-category": "高级属性",
+                "remarks": "数值(Y轴)字段选择"
             },
             "dataTagShow": {
                 "x-index": 310,
@@ -545,7 +548,8 @@
                 "type": "boolean",
                 "x-index": 320,
                 "default": true,
-                "x-category": "高级属性"
+                "x-category": "高级属性",
+                "remarks": "数据标签字段选择"
             },
             "unitShow": {
                 "x-index": 330,

package/dist/configs/components/chart/pie.json

@@ -245,7 +245,8 @@
                         "target": "*(xIsCountEmpty)",
                         "condition": "{{ $self.value && ($self.value.format !=='datetime' && $self.value.format !=='date') }}"
                     }
-                ]
+                ],
+                "remarks": "X轴数值字段选择"
             },
             "xStatistics": {
                 "title": "统计维度",
@@ -277,7 +278,8 @@
                     "isMethod": true,
                     "dataSourceNamePropKey": "dataSource",
                     "maxFieldCount": 1
-                }
+                },
+                "remarks": "Y轴数值字段选择"
             },
             "legendShow": {
                 "x-index": 120,
@@ -358,7 +360,8 @@
                 "type": "boolean",
                 "x-index": 170,
                 "default": true,
-                "x-category": "高级属性"
+                "x-category": "高级属性",
+                "remarks": "数据标签字段选择"
             },
             "isPercent": {
                 "title": "显示百分比",

package/dist/docs/common/format.js

@@ -3,6 +3,21 @@ export const sortBy = (props) => {
         return a[props] - b[props];
     };
 };
+const platMaps = {
+    PCWEB: 'PC端',
+    MOBILEWEB: '移动端',
+    MP: '小程序',
+    WEB: 'WEB端',
+};
+const platTranslate = (platforms = []) => {
+    const platRemark = [];
+    if (platforms && platforms.length > 0) {
+        platforms.forEach((e) => {
+            platRemark.push(platMaps[e]);
+        });
+    }
+    return platRemark;
+};
 export const objFormat = (args, type, origin) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
     //判断属性title值是否为拓展写法
@@ -16,9 +31,9 @@ export const objFormat = (args, type, origin) => {
                 description: ((_e = args[i]) === null || _e === void 0 ? void 0 : _e.remarks) || '-',
                 platforms: args[i]['x-platforms']
                     ? args[i]['x-platforms'].indexOf('MP') > -1
-                        ? '小程序端'
+                        ? '小程序'
                         : args[i]['x-platforms'].indexOf('WEB') > -1
-                            ? 'web端'
+                            ? 'WEB端'
                             : '兼容三端'
                     : '兼容三端',
             });
@@ -30,11 +45,15 @@ export const objFormat = (args, type, origin) => {
                 args[i]['x-component'] == 'Divider') {
                 continue;
             }
+            const titleName = args[i].title.indexOf('{{') != -1
+                ? (_h = args[i]) === null || _h === void 0 ? void 0 : _h.title.match(uuidReg)[1]
+                : (_j = args[i]) === null || _j === void 0 ? void 0 : _j.title;
             transformData.push({
                 code: i,
-                title: args[i].title.indexOf('{{') != -1
-                    ? (_h = args[i]) === null || _h === void 0 ? void 0 : _h.title.match(uuidReg)[1]
-                    : (_j = args[i]) === null || _j === void 0 ? void 0 : _j.title,
+                title: titleName +
+                    (platTranslate(args[i]['x-platforms']).length > 0
+                        ? '(' + platTranslate(args[i]['x-platforms']).join(',') + ')'
+                        : ''),
                 description: ((_k = args[i]) === null || _k === void 0 ? void 0 : _k.remarks) || '-',
                 type: ((_l = args[i]) === null || _l === void 0 ? void 0 : _l.type) || '-',
                 default: JSON.stringify((_m = args[i]) === null || _m === void 0 ? void 0 : _m.default) || '-',

package/dist/web/actions/showModal/index.css

@@ -0,0 +1,3 @@
+.weapps__modal {
+  z-index: 5001 !important;
+}

package/dist/web/actions/showModal/index.d.ts

@@ -1,3 +1,4 @@
+import './index.css';
 export default function showModal({ data }: {
     data: any;
 }): Promise<unknown>;

package/dist/web/actions/showModal/index.js

@@ -3,6 +3,7 @@ import * as React from 'react';
 import { forwardRef, useState, useEffect, useImperativeHandle } from 'react';
 import { Modal, Button, Text, ConfigProvider } from 'tea-component';
 import { noop } from '../../utils/constant';
+import './index.css';
 const ModalShow = forwardRef(function ModalShow(props, ref) {
     const [visible, setVisible] = useState(false);
     // 渲染之后，马上显示

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

@@ -70,12 +70,6 @@ export function ImageUploaderH5({ title, maxUploadCount, maxSize = 10, acceptTyp
         setProgress(percentCompleted);
     };
     const uploadToTcb = (file) => {
-        if ((file === null || file === void 0 ? void 0 : file.type.split('/')[0]) !== 'image') {
-            weui.alert('请上传图片', {
-                title: 'Image Type Error',
-            });
-            return false;
-        }
         setUploading(true);
         getCloudInstance().then(async (tcb) => {
             var _a;
@@ -105,6 +99,29 @@ export function ImageUploaderH5({ title, maxUploadCount, maxSize = 10, acceptTyp
             ? IMAGE_TYPES
             : Array.from(new Set(acceptTypes));
     }, [acceptTypes]);
+    const islegalType = (files, accepts) => {
+        const illegalType = [];
+        let isImage = true;
+        for (const file of files) {
+            if ((file === null || file === void 0 ? void 0 : file.type.split('/')[0]) !== 'image') {
+                weui.alert('请上传图片', {
+                    title: 'Image Type Error',
+                });
+                isImage = false;
+                break;
+            }
+            accepts.some((item) => item === (file === null || file === void 0 ? void 0 : file.type))
+                ? null
+                : illegalType.push(file === null || file === void 0 ? void 0 : file.type);
+        }
+        if (!isImage)
+            return false;
+        if (illegalType.length > 0) {
+            weui.alert('不支持上传' + Array.from(new Set(illegalType)).join(',') + '格式图片');
+            return false;
+        }
+        return true;
+    };
     const showAdd = React.useMemo(() => {
         if (single) {
             // single 模式时，仅当数组为空时显示
@@ -125,6 +142,8 @@ export function ImageUploaderH5({ title, maxUploadCount, maxSize = 10, acceptTyp
                             "%")))),
                 showAdd && (React.createElement("div", { className: "weui-uploader__input-box" }, !disabled && (React.createElement("input", { id: "uploaderInput", className: "weui-uploader__input", type: "file", accept: accepts.join(','), multiple: true, onChange: (e) => {
                         const files = [...e.target.files];
+                        if (!islegalType(files, accepts))
+                            return;
                         if (files.some((f) => f.size > maxSize * 1024 * 1024)) {
                             weui.alert('请上传不超过10M的图片');
                             return false;
@@ -150,7 +169,8 @@ function SingleImage({ src, deleteBySrc }) {
     React.useEffect(() => {
         const getSrc = async () => {
             try {
-                const _src = await getTempFileURL(src);
+                const url = await getTempFileURL(src);
+                const _src = encodeURI(url);
                 setRealSrc(_src);
                 return _src;
             }

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

@@ -68,8 +68,36 @@ export function UploaderPCInner(props) {
             fileRef.current = fileIDList;
         }
     });
+    //验证上传文件类型是否合法
+    const islegalType = (files, accepts) => {
+        const illegalType = [];
+        let isImage = true;
+        for (const file of files) {
+            if ((file === null || file === void 0 ? void 0 : file.type.split('/')[0]) !== 'image') {
+                message.error({ content: '请上传图片' });
+                isImage = false;
+                break;
+            }
+            accepts.some((item) => item === (file === null || file === void 0 ? void 0 : file.type))
+                ? null
+                : illegalType.push(file === null || file === void 0 ? void 0 : file.type);
+        }
+        if (!isImage)
+            return false;
+        if (illegalType.length > 0) {
+            message.error({
+                content: '不支持上传' +
+                    Array.from(new Set(illegalType)).join(',') +
+                    '格式图片',
+            });
+            return false;
+        }
+        return true;
+    };
     // 方法：上传前，判断图片大小、数量是否满足，取消默认组件的上传事件，用自定义的 tcb 上传方法
     const beforeHandle = (file, fileList, isAccepted, error) => {
+        if (!islegalType(fileList, extraProps['accept']))
+            return;
         if (!isAccepted) {
             try {
                 const errorList = [];
@@ -164,7 +192,8 @@ export const TcbImage = (props) => {
     React.useEffect(() => {
         const getSrc = async () => {
             try {
-                const _src = await getTempFileURL(fileID);
+                const url = await getTempFileURL(fileID);
+                const _src = encodeURI(url);
                 _src ? setSrc(_src) : setIsError(true);
             }
             catch (e) {

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

@@ -83,15 +83,29 @@ events = emptyObject, defaultValue, uploadPath = 'weda-uploader', single = true,
             ? ['*']
             : Array.from(new Set(acceptTypes));
     }, [acceptTypes]);
+    const islegalType = (files, accepts) => {
+        const illegalType = [];
+        for (const file of files) {
+            accepts.some((item) => item === (file === null || file === void 0 ? void 0 : file.type))
+                ? null
+                : illegalType.push(file === null || file === void 0 ? void 0 : file.type);
+        }
+        if (illegalType.length > 0) {
+            weui.alert('不支持上传' + Array.from(new Set(illegalType)).join(',') + '格式文件');
+            return false;
+        }
+        return true;
+    };
     // 上传后文件列表 fileIDList 改变事件，'add'|'delete'
     const handleChange = ({ fileID, uuid, type, size }) => {
         // 上传时新增事件
         if (type === 'add') {
             fileID && setFileSizeObj((obj) => ({ ...obj, [fileID]: size }));
-            fileID && setfileIDList([...fileIDList, fileID]);
+            fileID && setfileIDList((fileIDList) => [...fileIDList, fileID]);
         }
         else {
-            fileID && setfileIDList(fileIDList.filter((f) => f !== fileID));
+            fileID &&
+                setfileIDList((fileIDList) => fileIDList.filter((f) => f !== fileID));
         }
         uuid && setFileList((list) => list.filter((item) => uuid !== (item === null || item === void 0 ? void 0 : item._uuid)));
     };
@@ -120,6 +134,12 @@ events = emptyObject, defaultValue, uploadPath = 'weda-uploader', single = true,
                         React.createElement("div", null, btnDisabled ? (React.createElement(Button, { type: "weak", className: classNames(`${CLASS_PREFIX}__btn--weak`), disabled: btnDisabled }, btnTitle)) : (React.createElement("div", null,
                             React.createElement("input", { id: "uploaderInput", type: "file", "data-testid": "button-up", className: "weui-uploader-mobile__input", accept: accepts.join(','), multiple: !single, onChange: (e) => {
                                     const fileList = [...e.target.files];
+                                    //校验逻辑与图片有出入，文件类型限制为全部时，不设限
+                                    if (!(accepts.includes('*') ||
+                                        accepts.includes('') ||
+                                        accepts.length === 0) &&
+                                        !islegalType(fileList, accepts))
+                                        return;
                                     if (single && fileList.length > 1) {
                                         weui.alert(`上传文件总数不能超过1个`);
                                         return false;

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

@@ -68,6 +68,11 @@ acceptTypes = emptyArray, downloadVisible = true, deleteVisible = true, uploadPa
     });
     // 批量上传文件前置事件
     const handleBefore = (file, fileList, isAccepted, error) => {
+        if (!((acceptTypes === null || acceptTypes === void 0 ? void 0 : acceptTypes.includes('*')) ||
+            (acceptTypes === null || acceptTypes === void 0 ? void 0 : acceptTypes.includes('')) ||
+            (acceptTypes === null || acceptTypes === void 0 ? void 0 : acceptTypes.length) === 0) &&
+            !islegalType(fileList, uploadProps['accept']))
+            return;
         if (fileList.length + fileIDList.length > maxUploadCount) {
             message.warning({ content: `上传文件总数不能超过${maxUploadCount}个` });
             return false;
@@ -112,6 +117,24 @@ acceptTypes = emptyArray, downloadVisible = true, deleteVisible = true, uploadPa
     tips && (uploadProps['title'] = tips);
     maxSize && (uploadProps['maxSize'] = maxSize * 1024 * 1024);
     const btnDisabled = fileIDList.length >= maxUploadCount || (single && fileIDList.length > 0);
+    //验证上传文件类型是否合法
+    const islegalType = (files, accepts) => {
+        const illegalType = [];
+        for (const file of files) {
+            accepts.some((item) => item === (file === null || file === void 0 ? void 0 : file.type))
+                ? null
+                : illegalType.push(file === null || file === void 0 ? void 0 : file.type);
+        }
+        if (illegalType.length > 0) {
+            message.error({
+                content: '不支持上传' +
+                    Array.from(new Set(illegalType)).join(',') +
+                    '格式文件',
+            });
+            return false;
+        }
+        return true;
+    };
     return renderDecorator(React.createElement(ConfigProvider, { classPrefix: "wedatea2td" },
         React.createElement(FileContext.Provider, { value: {
                 uploadPath,
@@ -121,9 +144,9 @@ acceptTypes = emptyArray, downloadVisible = true, deleteVisible = true, uploadPa
                 isEdit,
                 events,
                 fileSizeObj,
-            } },
-            React.createElement("div", { className: `${CLASS_PREFIX}` },
-                isEdit && (React.createElement("div", { className: `${CLASS_PREFIX}__input-box` }, disabled || btnDisabled ? (React.createElement(Button, { type: "weak", disabled: true }, btnTitle)) : (React.createElement(Upload, { ...uploadProps, beforeUpload: handleBefore },
+            }, "data-testid": "button-up" },
+            React.createElement("div", { className: `${CLASS_PREFIX}`, "data-testid": "UploadFilePc" },
+                isEdit && (React.createElement("div", { className: `${CLASS_PREFIX}__input-box` }, disabled || btnDisabled ? (React.createElement(Button, { type: "weak", disabled: true }, btnTitle)) : (React.createElement(Upload, { ...uploadProps, beforeUpload: handleBefore, "data-testid": "Upload" },
                     React.createElement(Button, { type: "weak", className: `${CLASS_PREFIX}__btn--weak` }, btnTitle),
                     !single && (React.createElement(Text, { theme: "weak", className: `${CLASS_PREFIX}__btn-descripe` }, "\u652F\u6301\u6279\u91CF\u4E0A\u4F20")))))),
                 React.createElement(List, { split: "divide" },

package/package.json

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