@cloudbase/weda-ui 3.4.11 → 3.4.13

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

@@ -14,12 +14,12 @@ const uploadPath = 'weda-uploader';
 /**
  * H5端
  */
-export function ImageUploaderH5({ title: label, maxUploadCount, maxSize = 10, acceptTypes = IMAGE_TYPES, className, id, events = emptyObject, layout, defaultValue, single = false, disabled = false, requiredFlag = false, labelVisible = true, onChange, style, imgTypeCls, $node, }) {
+export function ImageUploaderH5({ title: label, maxUploadCount, maxSize = 10, acceptTypes = IMAGE_TYPES, className, id, events = emptyObject, layout: _layout, defaultValue, single = false, disabled = false, requiredFlag = false, labelVisible = true, onChange, style, imgTypeCls, $node, }) {
     var _a;
+    const layout = _layout !== 'vertical' ? 'horizontal' : 'vertical';
+    const layoutCls = layout === 'horizontal' ? 'weda-formcells weui-flex' : '';
     const cls = classNames({
         'weda-ui': true,
-        'weui-cells': true,
-        'weui-cells_form': true,
         [className]: className,
     });
     // 上传中
@@ -48,23 +48,16 @@ export function ImageUploaderH5({ title: label, maxUploadCount, maxSize = 10, ac
         return maxUploadCount;
     }, [single, maxUploadCount]);
     const deleteFile = (url) => {
-        if (single) {
-            setInputValue('');
-            return;
-        }
-        setInputValue((list) => list.filter((f) => f !== url));
+        const value = single ? '' : fileIdList.filter((f) => f !== url);
+        setInputValue(value);
+        handleChange([].concat(value));
+    };
+    const handleChange = (ids) => {
+        const value = single ? ids[0] || '' : ids;
+        setInputValue(value);
+        onChange === null || onChange === void 0 ? void 0 : onChange(value);
+        events === null || events === void 0 ? void 0 : events.change({ value });
     };
-    React.useEffect(() => {
-        if (single) {
-            const file = fileIdList[0] || '';
-            onChange && onChange(file);
-            events.change && events.change({ value: file });
-        }
-        else {
-            onChange && onChange(fileIdList);
-            events.change && events.change({ value: fileIdList });
-        }
-    }, [fileIdList]);
     const onProgress = (progressEvent) => {
         let percentCompleted = 0;
         try {
@@ -74,28 +67,29 @@ export function ImageUploaderH5({ title: label, maxUploadCount, maxSize = 10, ac
         catch (e) { }
         setProgress(percentCompleted);
     };
-    const uploadToTcb = (file) => {
-        setUploading(true);
-        getCloudInstance().then(async (tcb) => {
-            try {
-                const cloudPath = `${uploadPath}/${randomStr()}-${file === null || file === void 0 ? void 0 : file.name.replace(/[%#]/g, '-')}`;
-                const { fileID } = await tcb.uploadFile({
-                    cloudPath,
-                    filePath: file,
-                    onUploadProgress: onProgress,
-                });
-                fileID && setInputValue((list) => [...list, fileID]);
-                fileID && events.success && events.success({ value: fileID, file });
-            }
-            catch (err) {
-                weui.alert('上传失败，请检查网络后重试');
-                events.error && events.error(err);
-            }
-            finally {
-                setUploading(false);
-                setProgress(0);
-            }
-        });
+    const uploadToTcb = async (file) => {
+        var _a;
+        try {
+            setUploading(true);
+            const tcb = await getCloudInstance();
+            const cloudPath = `${uploadPath}/${randomStr()}-${file === null || file === void 0 ? void 0 : file.name.replace(/[%#]/g, '-')}`;
+            const { fileID } = await tcb.uploadFile({
+                cloudPath,
+                filePath: file,
+                onUploadProgress: onProgress,
+            });
+            (_a = events.success) === null || _a === void 0 ? void 0 : _a.call(events, { value: fileID, file });
+            setUploading(false);
+            return fileID;
+        }
+        catch (err) {
+            weui.alert('上传失败，请检查网络后重试');
+            events.error && events.error(err);
+        }
+        finally {
+            setUploading(false);
+            setProgress(0);
+        }
     };
     const accepts = React.useMemo(() => {
         return acceptTypes.includes('image/*') || acceptTypes.length === 0
@@ -132,25 +126,29 @@ export function ImageUploaderH5({ title: label, maxUploadCount, maxSize = 10, ac
         }
         return fileIdList.length < maxUploadCount;
     }, [fileIdList, single, maxUploadCount, uploading]);
-    return (_jsx("div", { className: cls, id: id, style: style, children: _jsx("div", { children: _jsxs("div", { className: classNames('weui-uploader', layout), children: [_jsx("div", { className: classNames('weui-uploader__hd', layout), children: _jsx(UploaderLabel, { layout: layout, label: label, labelVisible: labelVisible, currentCount: fileIdList.length, maxCount: finalMaxImgCount, requiredFlag: requiredFlag }) }), _jsxs("div", { className: "weui-uploader__bd", children: [_jsxs("ul", { className: "weui-uploader__files", id: "uploaderFiles", children: [(fileIdList !== null && fileIdList !== void 0 ? fileIdList : []).map((f) => (_jsx(SingleImage, { src: f, deleteBySrc: deleteFile, disabled: disabled, imgTypeCls: imgTypeCls }, f))), fileIdList.length < 1 && formType === 'read' && _jsx(_Fragment, { children: "\u2014" }), uploading && (_jsx("li", { className: `weui-uploader__file weui-uploader__file_status ${imgTypeCls}`, children: _jsxs("div", { className: "weui-uploader__file-content", children: [progress, "%"] }) }))] }), showAdd && formType !== 'read' && (_jsx("div", { className: `weui-uploader__input-box ${imgTypeCls}`, children: !disabled && (_jsx("input", { "data-testid": "uploaderh5_input", id: "uploaderInput", className: "weui-uploader__input", type: "file", accept: accepts.join(','), multiple: !single && !(browserEnv().android && browserEnv().weixin), onChange: (e) => {
-                                        const files = [...e.target.files];
-                                        if (!islegalType(files, accepts))
-                                            return;
-                                        if (files.some((f) => f.size > maxSize * 1024 * 1024)) {
-                                            weui.alert(`请上传不超过 ${maxSize}M 的图片`);
-                                            return false;
-                                        }
-                                        if (files.length > finalMaxImgCount) {
-                                            // 防止一下子选择过多文件
-                                            weui.alert(`最多只能上传${finalMaxImgCount}张图片，请重新选择`);
-                                            return false;
-                                        }
-                                        if (fileIdList.length + files.length > finalMaxImgCount) {
-                                            weui.alert(`最多只能上传${finalMaxImgCount}张图片`);
-                                            return false;
-                                        }
-                                        files.forEach((f) => uploadToTcb(f));
-                                    } })) }))] })] }) }) }));
+    const uploadChange = async (e) => {
+        const files = [...e.target.files];
+        if (!islegalType(files, accepts))
+            return;
+        if (files.some((f) => f.size > maxSize * 1024 * 1024)) {
+            weui.alert(`请上传不超过 ${maxSize}M 的图片`);
+            return false;
+        }
+        if (files.length > finalMaxImgCount) {
+            // 防止一下子选择过多文件
+            weui.alert(`最多只能上传${finalMaxImgCount}张图片，请重新选择`);
+            return false;
+        }
+        if (fileIdList.length + files.length > finalMaxImgCount) {
+            weui.alert(`最多只能上传${finalMaxImgCount}张图片`);
+            return false;
+        }
+        const promiseAll = files.map((f) => uploadToTcb(f));
+        const result = await Promise.all(promiseAll);
+        const ids = [].concat(fileIdList, result);
+        handleChange(ids);
+    };
+    return (_jsx("div", { className: cls, id: id, style: style, children: _jsxs("div", { className: classNames('weui-uploader weui-cells weui-cells_form weda-formcells', layout, layoutCls), children: [_jsx("div", { className: classNames('weui-uploader__hd', layout), children: _jsx(UploaderLabel, { layout: layout, label: label, labelVisible: labelVisible, currentCount: fileIdList.length, maxCount: finalMaxImgCount, requiredFlag: requiredFlag }) }), _jsxs("div", { className: "weui-uploader__bd", children: [_jsxs("ul", { className: "weui-uploader__files", id: "uploaderFiles", children: [(fileIdList !== null && fileIdList !== void 0 ? fileIdList : []).map((f) => (_jsx(SingleImage, { src: f, deleteBySrc: deleteFile, disabled: disabled, imgTypeCls: imgTypeCls }, f))), fileIdList.length < 1 && formType === 'read' && _jsx(_Fragment, { children: "\u2014" }), uploading && (_jsx("li", { className: `weui-uploader__file weui-uploader__file_status ${imgTypeCls}`, children: _jsxs("div", { className: "weui-uploader__file-content", children: [progress, "%"] }) }))] }), showAdd && formType !== 'read' && (_jsx("div", { className: `weui-uploader__input-box ${imgTypeCls}`, children: !disabled && (_jsx("input", { "data-testid": "uploaderh5_input", id: "uploaderInput", className: "weui-uploader__input", type: "file", accept: accepts.join(','), multiple: !single && !(browserEnv().android && browserEnv().weixin), onChange: uploadChange })) }))] })] }) }));
 }
 function SingleImage({ src, deleteBySrc, disabled, imgTypeCls, }) {
     const cls = classNames({
@@ -176,7 +174,7 @@ function SingleImage({ src, deleteBySrc, disabled, imgTypeCls, }) {
 }
 const UploaderLabel = ({ layout, label, currentCount, maxCount, requiredFlag, labelVisible, }) => {
     if (layout === 'horizontal') {
-        return (_jsx(React.Fragment, { children: _jsx(_Fragment, { children: labelVisible && (_jsxs("div", { className: "weda-formcells__label weui-cell", children: [_jsxs("div", { children: [_jsx("p", { className: "weui-uploader__title", children: label }), _jsxs("div", { className: "weui-uploader__info", children: [_jsx("span", { id: "uploadCount", children: currentCount }), "/", maxCount] })] }), requiredFlag && (_jsx("label", { className: "weda-formcells__flag", children: "*" }))] })) }) }));
+        return (_jsx(React.Fragment, { children: _jsx(_Fragment, { children: labelVisible && (_jsx("div", { className: "weda-formcells__label weui-cell", children: _jsxs("div", { children: [requiredFlag && (_jsx("label", { className: "weda-formcells__flag", children: "*" })), _jsx("p", { className: "weui-uploader__title", children: label }), _jsxs("div", { className: "weui-uploader__info", children: [_jsx("span", { id: "uploadCount", children: currentCount }), "/", maxCount] })] }) })) }) }));
     }
-    return (_jsx(React.Fragment, { children: _jsx(_Fragment, { children: labelVisible && (_jsxs("div", { className: "weda-formcells__label weui-cell", children: [_jsxs("div", { className: "weui-uploader__label", children: [_jsx("p", { className: "weui-uploader__title", children: label }), requiredFlag && (_jsx("label", { className: "weda-formcells__flag", children: "*" }))] }), _jsxs("div", { className: "weui-uploader__info", children: [_jsx("span", { id: "uploadCount", children: currentCount }), "/", maxCount] })] })) }) }));
+    return (_jsx(React.Fragment, { children: _jsx(_Fragment, { children: labelVisible && (_jsxs("div", { className: "weda-formcells__label weui-cell", children: [_jsxs("div", { className: "weui-uploader__label", children: [requiredFlag && (_jsx("label", { className: "weda-formcells__flag", children: "*" })), _jsx("p", { className: "weui-uploader__title", children: label })] }), _jsxs("div", { className: "weui-uploader__info", children: [_jsx("span", { id: "uploadCount", children: currentCount }), "/", maxCount] })] })) }) }));
 };

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

@@ -44,32 +44,27 @@ export function UploaderPCInner(props) {
     const [progress, setProgress] = React.useState(0);
     // 文件列表
     const [fileIDList, setfileIDList] = React.useState([]);
-    const fileRef = React.useRef([]);
     const formType = ((_a = getParentForm($node)) === null || _a === void 0 ? void 0 : _a.formType) || 'create';
+    const defaultValueRef = React.useRef(null);
     React.useEffect(() => {
+        if (isObjectEqual(defaultValueRef.current, defaultValue))
+            return;
         let initialValue = []
             .concat(value ? value : defaultValue)
             .filter((d) => typeof d === 'string' && d !== '');
         if (single) {
             initialValue = initialValue[0] ? [initialValue[0]] : [];
         }
+        defaultValueRef.current = defaultValue;
         setfileIDList(initialValue);
     }, [defaultValue, single]);
-    // 值变化事件
-    React.useEffect(() => {
-        if (!isObjectEqual(fileRef.current, fileIDList)) {
-            if (single) {
-                const file = fileIDList[0] || '';
-                onChange && onChange(file);
-                events.change && events.change({ value: file });
-            }
-            else {
-                onChange && onChange(fileIDList);
-                events.change && events.change({ value: fileIDList });
-            }
-            fileRef.current = fileIDList;
-        }
-    });
+    const handleChange = (ids) => {
+        var _a;
+        setfileIDList(ids);
+        const value = single ? ids[0] || '' : ids;
+        onChange === null || onChange === void 0 ? void 0 : onChange(value);
+        (_a = events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value });
+    };
     //验证上传文件类型是否合法
     const islegalType = (files, accepts) => {
         const illegalType = [];
@@ -114,32 +109,43 @@ export function UploaderPCInner(props) {
             catch (e) { }
             return false;
         }
-        uploadTcb(file);
+        const ids = fileList.filter((f) => !!f.id);
+        if (ids.length < fileList.length)
+            return false;
+        uploadTcbMulti(fileList);
         return false;
     };
+    // 多张上传
+    const uploadTcbMulti = async (files) => {
+        const promiseAll = files.map((f) => uploadTcb(f));
+        const result = await Promise.all(promiseAll);
+        const ids = [].concat(fileIDList, result);
+        handleChange(ids);
+    };
     // 自定义上传到 Tcb 的 COS
-    const uploadTcb = (file) => {
-        setUploading(true);
-        getCloudInstance().then(async (tcb) => {
-            try {
-                const cloudPath = `${uploadPath}/${randomStr()}-${file === null || file === void 0 ? void 0 : file.name.replace(/[%#]/g, '-')}`;
-                const { fileID } = await tcb.uploadFile({
-                    cloudPath,
-                    filePath: file,
-                    onUploadProgress: onProgress,
-                });
-                fileID && setfileIDList((list) => [...list, fileID]);
-                fileID && events.success && events.success({ value: fileID, file });
-            }
-            catch (err) {
-                message.error({ content: '上传失败，请检查网络后重试' });
-                events.error && events.error(err);
-            }
-            finally {
-                setUploading(false);
-                setProgress(0);
-            }
-        });
+    const uploadTcb = async (file) => {
+        var _a;
+        try {
+            setUploading(true);
+            const tcb = await getCloudInstance();
+            const cloudPath = `${uploadPath}/${randomStr()}-${file === null || file === void 0 ? void 0 : file.name.replace(/[%#]/g, '-')}`;
+            const { fileID } = await tcb.uploadFile({
+                cloudPath,
+                filePath: file,
+                onUploadProgress: onProgress,
+            });
+            (_a = events.success) === null || _a === void 0 ? void 0 : _a.call(events, { value: fileID, file });
+            setUploading(false);
+            return fileID;
+        }
+        catch (err) {
+            message.error({ content: '上传失败，请检查网络后重试' });
+            events.error && events.error(err);
+        }
+        finally {
+            setUploading(false);
+            setProgress(0);
+        }
     };
     // 计算上传进度
     const onProgress = (progressEvent) => {
@@ -153,7 +159,8 @@ export function UploaderPCInner(props) {
     };
     // 删除图片
     const deleteHandle = (fileID) => {
-        setfileIDList((list) => list.filter((d) => d !== fileID));
+        const ids = fileIDList.filter((d) => d !== fileID);
+        handleChange(ids);
     };
     // 转换后的属性
     const extraProps = {};
@@ -201,7 +208,7 @@ export const TcbImage = (props) => {
 export function encodeConvert(src) {
     if (src) {
         try {
-            return 'https://' + decodeURIComponent(src.split('https://')[1]);
+            return decodeURIComponent(src);
         }
         catch (e) {
             return src;

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

@@ -56,22 +56,16 @@ events = emptyObject, defaultValue, uploadPath = 'weda-uploader', single = true,
         }
     }, [defaultValue]);
     React.useEffect(() => {
-        var _a, _b, _c;
+        var _a, _b;
+        if (isObjectEqual(fileRef.current, fileIDList))
+            return;
         // 外部 onChange 事件
         const pureFileIDList = fileIDList.filter((d) => isCloudFileID(d) || isHttpFileID(d));
-        if (single) {
-            const file = pureFileIDList[0] || '';
-            file && onChange && onChange(file);
-            (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value: file });
-        }
-        else {
-            onChange && onChange(pureFileIDList);
-            (_b = events === null || events === void 0 ? void 0 : events.change) === null || _b === void 0 ? void 0 : _b.call(events, { value: pureFileIDList });
-        }
-        if (!isObjectEqual(fileRef.current, fileIDList)) {
-            (_c = events === null || events === void 0 ? void 0 : events.success) === null || _c === void 0 ? void 0 : _c.call(events, { value: pureFileIDList });
-            fileRef.current = fileIDList;
-        }
+        const value = single ? pureFileIDList[0] || '' : pureFileIDList;
+        onChange === null || onChange === void 0 ? void 0 : onChange(value);
+        (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value });
+        (_b = events === null || events === void 0 ? void 0 : events.success) === null || _b === void 0 ? void 0 : _b.call(events, { value: pureFileIDList });
+        fileRef.current = fileIDList;
     }, [fileIDList]);
     // 外层组件类
     const cls = classNames({
@@ -86,19 +80,6 @@ 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) {
-            if (!accepts.includes(file === null || file === void 0 ? void 0 : file.type)) {
-                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 }) => {
         // 上传时新增事件
@@ -135,12 +116,6 @@ events = emptyObject, defaultValue, uploadPath = 'weda-uploader', single = true,
                 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 ? (_jsx(Button, { type: "weak", className: classNames(`${CLASS_PREFIX}__btn--weak`), disabled: btnDisabled, children: 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: (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

@@ -57,22 +57,16 @@ acceptTypes = emptyArray, downloadVisible = true, deleteVisible = true, uploadPa
         }
     }, [defaultValue]);
     React.useEffect(() => {
-        var _a, _b, _c;
+        var _a, _b;
+        if (isObjectEqual(fileRef.current, fileIDList))
+            return;
         // 外部 onChange 事件
         const pureFileIDList = fileIDList.filter((d) => isCloudFileID(d) || isHttpFileID(d));
-        if (single) {
-            const file = pureFileIDList[0] || '';
-            onChange === null || onChange === void 0 ? void 0 : onChange(file);
-            (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value: file });
-        }
-        else {
-            onChange === null || onChange === void 0 ? void 0 : onChange(pureFileIDList);
-            (_b = events === null || events === void 0 ? void 0 : events.change) === null || _b === void 0 ? void 0 : _b.call(events, { value: pureFileIDList });
-        }
-        if (!isObjectEqual(fileRef.current, fileIDList)) {
-            (_c = events === null || events === void 0 ? void 0 : events.success) === null || _c === void 0 ? void 0 : _c.call(events, { value: pureFileIDList });
-            fileRef.current = fileIDList;
-        }
+        const value = single ? pureFileIDList[0] || '' : pureFileIDList;
+        onChange === null || onChange === void 0 ? void 0 : onChange(value);
+        (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value });
+        (_b = events === null || events === void 0 ? void 0 : events.success) === null || _b === void 0 ? void 0 : _b.call(events, { value: pureFileIDList });
+        fileRef.current = fileIDList;
     }, [fileIDList]);
     // 外层组件类
     const cls = classNames({
@@ -81,11 +75,6 @@ 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;
@@ -137,24 +126,6 @@ acceptTypes = emptyArray, downloadVisible = true, deleteVisible = true, uploadPa
             (single && fileList.length > 0) ||
             disabled);
     }, [disabled, fileIDList.length, fileList, maxUploadCount, single]);
-    //验证上传文件类型是否合法
-    const islegalType = (files, accepts) => {
-        const illegalType = [];
-        for (const file of files) {
-            if (!accepts.includes(file === null || file === void 0 ? void 0 : file.type)) {
-                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(_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsx(FileContext.Provider, { value: {
                 uploadPath,
                 downloadVisible,

package/dist/web/components/form/userOrgSelect/common/fetch-data-service.js

@@ -26,12 +26,15 @@ export const getUserListByIds = async (porps) => {
  * @returns
  */
 export const errorHandle = (error, action) => {
-    var _a;
+    var _a, _b;
+    console.error(`接口 ${action} 出错: `, error);
     if (error === null || error === void 0 ? void 0 : error.result) {
-        return `${(_a = error === null || error === void 0 ? void 0 : error.result) === null || _a === void 0 ? void 0 : _a.message}(${action}${error === null || error === void 0 ? void 0 : error.requestId})`;
+        return (error === null || error === void 0 ? void 0 : error.requestId)
+            ? `${(_a = error === null || error === void 0 ? void 0 : error.result) === null || _a === void 0 ? void 0 : _a.message}(${error === null || error === void 0 ? void 0 : error.requestId})`
+            : `${(_b = error === null || error === void 0 ? void 0 : error.result) === null || _b === void 0 ? void 0 : _b.message}`;
     }
     else {
-        return `${action}(${(error === null || error === void 0 ? void 0 : error.message) || error})`;
+        return `${(error === null || error === void 0 ? void 0 : error.message) || error}`;
     }
 };
 /**
@@ -42,23 +45,28 @@ export const errorHandle = (error, action) => {
  */
 export const fetchUserListByIds = async (selectUserIds = [], request) => {
     try {
-        let pageNo = 1;
-        const pageSize = 50;
-        let records = [];
-        let total = 9999;
-        for (let index = 0; index < Math.floor(total / pageSize) + 1; index++) {
-            const data = await request('DescribeWedaUsersRuntime', {
-                pageNo: pageNo,
-                pageSize: pageSize,
-                UserIds: selectUserIds || [],
+        const PAGE_SIZE = 50;
+        const total = selectUserIds.length;
+        const records = [];
+        const promises = [];
+        for (let index = 1; index <= Math.ceil(total / PAGE_SIZE); index++) {
+            const start = (index - 1) * PAGE_SIZE;
+            const end = start + PAGE_SIZE;
+            promises.push(request('DescribeWedaUsersRuntime', {
+                UserIds: selectUserIds.slice(start, end),
                 UserType: 'internalUser',
                 NeedPrimaryColumn: true,
                 IsNoRelatedOrgFlag: false,
-            });
-            pageNo = pageNo + 1;
-            if (data === null || data === void 0 ? void 0 : data.UserList) {
-                total = (data === null || data === void 0 ? void 0 : data.Total) || 0;
-                records = records.concat(data === null || data === void 0 ? void 0 : data.UserList);
+                PageNo: 1,
+                PageSize: PAGE_SIZE,
+            }));
+        }
+        const results = await Promise.all(promises);
+        for (const res of results) {
+            if (res.UserList &&
+                Array.isArray(res.UserList) &&
+                res.UserList.length > 0) {
+                records.push(...res.UserList);
             }
         }
         return records;
@@ -171,44 +179,62 @@ async function fetchUsersByOrgId(params, request) {
         throw errorHandle(error, 'LazyDescribeOrgs');
     }
 }
-/**
- * 获取当前组织列表总数
- */
-export const fetchOrgTotal = async (request) => {
-    try {
-        return await request('DescribeOrgs', {
-            pageNo: 1,
-            pageSize: 1,
-        }).then((data) => {
-            return (data === null || data === void 0 ? void 0 : data.Total) || 0;
-        });
-    }
-    catch (error) {
-        console.error('错误', error);
-        throw errorHandle(error, 'fetchOrgTotal');
-    }
-};
 /**
  *获取全量组织数据
  */
-export const DescribeOrgs = async (request) => {
+export const DescribeOrgs = async (request, params) => {
     try {
-        const total = await fetchOrgTotal(request);
-        let records = [];
-        if (total > 0) {
-            const resultPromise = [];
-            for (let index = 1; index <= Math.ceil(total / 1000); index++) {
-                const DescribeOrgsByPage = request('DescribeOrgs', {
-                    pageNo: index,
-                    pageSize: 1000,
-                }) || {};
-                resultPromise.push(DescribeOrgsByPage);
+        const PAGE_SIZE = 1000;
+        // 如果传递了 params.corpScopes 参数，则只拉取这些企业下的部门展示
+        const corpScopes = params === null || params === void 0 ? void 0 : params.corpScopes;
+        const queryList = [];
+        if (corpScopes && Array.isArray(corpScopes) && corpScopes.length > 0) {
+            if (corpScopes.length === 1) {
+                queryList.push({
+                    Key: '_organizationId',
+                    Rel: 'eq',
+                    Val: corpScopes[0],
+                });
             }
-            await Promise.all(resultPromise).then((data) => {
-                (data || []).map((item) => {
-                    records = records.concat(item === null || item === void 0 ? void 0 : item.DataList);
+            else {
+                queryList.push({
+                    Key: '_organizationId',
+                    Rel: 'in',
+                    Val: corpScopes,
                 });
-            });
+            }
+        }
+        const QueryWhereList = queryList.length > 0 ? queryList : undefined;
+        const result = await request('DescribeOrgs', {
+            pageNo: 1,
+            pageSize: PAGE_SIZE,
+            QueryWhereList,
+        });
+        const Total = (result === null || result === void 0 ? void 0 : result.Total) || 0;
+        const DataList = (result === null || result === void 0 ? void 0 : result.DataList) || [];
+        const total = Number(Total);
+        // 一页拉取了全部数据，直接返回
+        if (total <= PAGE_SIZE) {
+            return DataList;
+        }
+        const records = [...DataList];
+        const promises = [];
+        // 从第二页开始，并发拉取所有
+        for (let index = 2; index <= Math.ceil(total / PAGE_SIZE); index++) {
+            promises.push(request('DescribeOrgs', {
+                pageNo: index,
+                pageSize: PAGE_SIZE,
+                QueryWhereList,
+            }));
+        }
+        const results = await Promise.all(promises);
+        for (const res of results) {
+            if (res &&
+                res.DataList &&
+                Array.isArray(res.DataList) &&
+                res.DataList.length > 0) {
+                records.push(...res.DataList);
+            }
         }
         return records;
     }
@@ -256,6 +282,6 @@ export const fetchViewList = async () => {
     }
     catch (error) {
         console.error('错误', error);
-        throw errorHandle(error, 'DescribeOrgs');
+        throw errorHandle(error, 'fetchViewList');
     }
 };