@cloudbase/weda-ui 3.5.3 → 3.6.1

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

@@ -1,7 +1,9 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import * as React from 'react';
-import { Upload, ConfigProvider, Button, Icon, Text, List, } from 'tea-component';
-import { filterStrList, isCloudFileID, isHttpFileID, transSize, downloadFile, cutFileTitle, transFileCloudidToName, randomStr, isInIde, isWebInMiniprogram, } from '../../../utils/platform';
+import { Upload, ConfigProvider, Icon, List } from 'tea-component';
+import { WdButton } from '../../wd-button';
+import { WdText } from '../../wd-text';
+import { filterStrList, isCloudFileID, isHttpFileID, isDataUri, transSize, cutFileTitle, transFileCloudidToName, randomStr, isInIde, isWebInMiniprogram, transFileName, } from '../../../utils/platform';
 import { getCloudInstance } from '../../../utils/tcb';
 import classNames from '../../../utils/classnames';
 import { renderDecorator } from '../renderDecorator';
@@ -9,6 +11,8 @@ import isObjectEqual from '../../../utils/isObjectEqual';
 import { emptyArray, emptyObject } from '../../../utils/constant';
 import { useTempUrl } from '../../../utils/hooks/use-cloud-id-temp-url';
 import { getParentForm } from '../../../utils/widget-api';
+import { toBase64Uri } from '../../../utils/file2base64';
+import { isNil } from '../../../utils/lodash';
 // 默认组件类前缀
 const CLASS_PREFIX = 'weda-upload-file-pc';
 // 上传状态字典
@@ -29,7 +33,7 @@ layout, id = '', style, labelVisible = true, label = '上传文件', requiredFla
 // 组件属性
 decorator, tips = '', btnTitle = '点击上传', maxUploadCount = 9, maxSize = 1024, single = true, defaultValue = emptyArray, // 组件默认初始化值
 value = emptyArray, // 用于模型组件中 formily 的值管理
-acceptTypes = emptyArray, downloadVisible = true, deleteVisible = true, uploadPath = 'weda-uploader', onChange = null, isEdit = true, $node, readOnly, }) {
+acceptTypes = emptyArray, downloadVisible = true, deleteVisible = true, uploadPath = 'weda-uploader', onChange = null, isEdit = true, $node, readOnly, callbacks, }) {
     var _a;
     const [fileIDList, setfileIDList] = React.useState(() => {
         let defaultVal = defaultValue;
@@ -49,12 +53,19 @@ acceptTypes = emptyArray, downloadVisible = true, deleteVisible = true, uploadPa
     const fileRef = React.useRef(fileIDList);
     const maxSizeLimit = maxSize > 500 ? 500 : maxSize;
     const formType = ((_a = getParentForm($node)) === null || _a === void 0 ? void 0 : _a.formType) || 'create';
-    const changeTypeRef = React.useRef('');
+    const changeTypeRef = React.useRef(''); // 判断当前更新来自手动还是value变化
     React.useEffect(() => {
         //有有效默认值时不刷新，解决初次渲染默认值不显示问题
         if (!isInIde() && !isObjectEqual(prevDefaultRef.current, defaultValue)) {
             prevDefaultRef.current = defaultValue;
-            setfileIDList(filterStrList([].concat(Array.isArray(defaultValue) ? defaultValue : [defaultValue])));
+            changeTypeRef.current = '';
+            if (defaultValue === null) {
+                fileRef.current = [];
+                setfileIDList([]);
+            }
+            else {
+                setfileIDList(filterStrList([].concat(defaultValue)));
+            }
         }
     }, [defaultValue]);
     React.useEffect(() => {
@@ -62,12 +73,15 @@ acceptTypes = emptyArray, downloadVisible = true, deleteVisible = true, uploadPa
         if (isObjectEqual(fileRef.current, fileIDList))
             return;
         // 外部 onChange 事件
-        const pureFileIDList = fileIDList.filter((d) => isCloudFileID(d) || isHttpFileID(d));
+        const pureFileIDList = fileIDList.filter((d) => isCloudFileID(d) || isHttpFileID(d) || isDataUri(d));
         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 });
+        if (changeTypeRef.current) {
+            (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value });
+        }
         if (changeTypeRef.current === 'add') {
-            (_b = events === null || events === void 0 ? void 0 : events.success) === null || _b === void 0 ? void 0 : _b.call(events, { value: pureFileIDList });
+            const files = pureFileIDList.map((d) => { var _a; return (_a = fileSizeObj[d]) === null || _a === void 0 ? void 0 : _a.file; });
+            (_b = events === null || events === void 0 ? void 0 : events.success) === null || _b === void 0 ? void 0 : _b.call(events, { value: pureFileIDList, file: files });
         }
         fileRef.current = fileIDList;
     }, [fileIDList]);
@@ -77,14 +91,14 @@ acceptTypes = emptyArray, downloadVisible = true, deleteVisible = true, uploadPa
         [className]: className,
     });
     // 批量上传文件前置事件
-    const handleBefore = (file, fileList, isAccepted, error) => {
+    const handleBefore = async (file, fileList, isAccepted, error) => {
         var _a, _b, _c, _d;
         if (fileList.length + fileIDList.length > maxUploadCount) {
             (_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: `上传文件总数不能超过${maxUploadCount}个`,
                 icon: 'error',
             });
-            return false;
+            return Promise.reject(false);
         }
         if (!isAccepted) {
             try {
@@ -101,18 +115,53 @@ acceptTypes = emptyArray, downloadVisible = true, deleteVisible = true, uploadPa
                 });
             }
             catch (e) { }
-            return false;
+            return Promise.reject(false);
+        }
+        // @ts-expect-error Tea 会加 id  https://git.woa.com/tea-design/tea2/blob/eb22eeddf0c06dda9382e269b8fda46e448ed203/tea-component/src/upload/Upload.tsx#L192
+        const ids = fileList.filter((f) => !!f.id);
+        if (ids.length < fileList.length)
+            return Promise.reject(false); // https://git.woa.com/QBase/lcap/weda-ui/merge_requests/1010 满足这个条件是最后一个,避免多次触发
+        let shouldUploadToCos = true;
+        if (typeof (callbacks === null || callbacks === void 0 ? void 0 : callbacks.beforeUpload) === 'function') {
+            try {
+                const base64Uri = await Promise.all(fileList.map((file) => toBase64Uri(file)));
+                const ret = await callbacks.beforeUpload({
+                    files: fileList,
+                    base64Uri,
+                });
+                if (typeof ret === 'boolean') {
+                    shouldUploadToCos = ret;
+                }
+                else if (Array.isArray(ret) &&
+                    ret.every((item) => item instanceof File)) {
+                    fileList = ret;
+                }
+                else if (!isNil(ret)) {
+                    throw new TypeError('web端返回值接受布尔值 / File对象数组');
+                }
+            }
+            catch (err) {
+                console.error('上传前处理函数抛错', err);
+                shouldUploadToCos = false;
+            }
+        }
+        if (shouldUploadToCos === false) {
+            return Promise.reject(false);
         }
         file['_uuid'] = randomStr();
-        setFileList((list) => [...list, file]);
-        return false;
+        fileList = fileList.map((f) => {
+            f['_uuid'] = randomStr();
+            return f;
+        });
+        setFileList((list) => [...list, ...fileList]);
+        return Promise.reject(false);
     };
     // 上传后文件列表 fileIDList 改变事件，'add'|'delete'
-    const handleChange = ({ fileID, uuid, type, size }) => {
+    const handleChange = ({ fileID, uuid, type, size, file }) => {
         if (fileID) {
             changeTypeRef.current = type;
             if (type === 'add') {
-                setFileSizeObj((obj) => ({ ...obj, [fileID]: size }));
+                setFileSizeObj((obj) => ({ ...obj, [fileID]: { size, file } }));
                 setfileIDList((list) => [...list, fileID]);
             }
             else {
@@ -147,7 +196,7 @@ acceptTypes = emptyArray, downloadVisible = true, deleteVisible = true, uploadPa
                 isEdit,
                 events,
                 fileSizeObj,
-            }, "data-testid": "button-up", children: _jsxs("div", { className: `${CLASS_PREFIX}`, "data-testid": "UploadFilePc", children: [isEdit && (_jsx("div", { className: `${CLASS_PREFIX}__input-box`, children: btnDisabled ? (readOnly ? null : (_jsx(Button, { type: "weak", disabled: true, children: btnTitle }))) : (_jsxs(Upload, { ...uploadProps, beforeUpload: handleBefore, "data-testid": "Upload", children: [_jsx(Button, { type: "weak", className: `${CLASS_PREFIX}__btn--weak`, children: btnTitle }), !single && (_jsx(Text, { theme: "weak", className: `${CLASS_PREFIX}__btn-descripe`, children: "\u652F\u6301\u6279\u91CF\u4E0A\u4F20" }))] })) })), _jsxs(List, { split: "divide", children: [_jsx(List.Item, { children: _jsxs("div", { className: `${CLASS_PREFIX}--item ${CLASS_PREFIX}--item-header`, children: [_jsx("div", { className: `${CLASS_PREFIX}--item-title ${CLASS_PREFIX}--item-label`, children: "\u6587\u4EF6\u540D" }), formType !== 'read' && (_jsx("div", { className: `${CLASS_PREFIX}--item-size ${CLASS_PREFIX}--item-label`, children: "\u5927\u5C0F" })), _jsx("div", { className: `${CLASS_PREFIX}--item-status ${CLASS_PREFIX}--item-label`, children: "\u72B6\u6001" }), _jsx("div", { className: `${CLASS_PREFIX}--item-action`, children: "\u64CD\u4F5C" })] }) }), fileIDList.map((d) => (_jsx(List.Item, { children: _jsx(TcbFileEcho, { disabled: disabled, fileID: d, formType: formType }) }, d))), fileList.map((item) => (_jsx(List.Item, { children: _jsx(TcbFileUpload, { disabled: disabled, file: item, formType: formType }) }, item === null || item === void 0 ? void 0 : item._uuid))), !readOnly &&
+            }, "data-testid": "button-up", children: _jsxs("div", { className: `${CLASS_PREFIX} ${readOnly ? `${CLASS_PREFIX}__readOnly` : ''}`, "data-testid": "UploadFilePc", children: [isEdit && (_jsx("div", { className: `${CLASS_PREFIX}__input-box`, children: btnDisabled ? (readOnly ? null : (_jsx(WdButton, { disabled: true, text: btnTitle, theme: "secondary", variant: "outline" }))) : (_jsxs(Upload, { ...uploadProps, beforeUpload: handleBefore, "data-testid": "Upload", children: [_jsx(WdButton, { className: `${CLASS_PREFIX}__btn--weak`, text: btnTitle, theme: "secondary", variant: "outline" }), !single && (_jsx(WdText, { text: "\u652F\u6301\u6279\u91CF\u4E0A\u4F20", className: `${CLASS_PREFIX}__btn-descripe` }))] })) })), _jsxs(List, { split: "divide", children: [_jsx(List.Item, { children: _jsxs("div", { className: `${CLASS_PREFIX}--item ${CLASS_PREFIX}--item-header`, children: [_jsx("div", { className: `${CLASS_PREFIX}--item-title ${CLASS_PREFIX}--item-label`, children: "\u6587\u4EF6\u540D" }), formType !== 'read' && (_jsx("div", { className: `${CLASS_PREFIX}--item-size ${CLASS_PREFIX}--item-label`, children: "\u5927\u5C0F" })), _jsx("div", { className: `${CLASS_PREFIX}--item-status ${CLASS_PREFIX}--item-label`, children: "\u72B6\u6001" }), _jsx("div", { className: `${CLASS_PREFIX}--item-action ${CLASS_PREFIX}--item-label`, children: "\u64CD\u4F5C" })] }) }), fileIDList.map((d) => (_jsx(List.Item, { children: _jsx(TcbFileEcho, { disabled: disabled, fileID: d, formType: formType }) }, d))), fileList.map((item) => (_jsx(List.Item, { children: _jsx(TcbFileUpload, { disabled: disabled, file: item, formType: formType }) }, item === null || item === void 0 ? void 0 : item._uuid))), !readOnly &&
                                 isEdit &&
                                 fileIDList.length === 0 &&
                                 fileList.length === 0 && (_jsx(List.Item, { className: `${CLASS_PREFIX}--item-empty`, children: _jsxs("div", { className: `${CLASS_PREFIX}--item`, children: ["\u70B9\u51FB\u4E0A\u65B9\u201C", btnTitle, "\u201D\u6309\u94AE"] }) }))] })] }) }) }), decorator)({
@@ -164,6 +213,7 @@ acceptTypes = emptyArray, downloadVisible = true, deleteVisible = true, uploadPa
  * 基于 FileID 回显文件表格行组件
  */
 const TcbFileEcho = ({ fileID, disabled, formType, readOnly, }) => {
+    var _a;
     const { fileSizeObj } = React.useContext(FileContext) || {};
     const { data: src } = useTempUrl(fileID);
     const title = React.useMemo(() => {
@@ -171,10 +221,10 @@ const TcbFileEcho = ({ fileID, disabled, formType, readOnly, }) => {
             return transFileCloudidToName(fileID);
         }
         else {
-            return fileID;
+            return transFileName(fileID);
         }
     }, [fileID]);
-    return (_jsxs("div", { className: `${CLASS_PREFIX}--item ${CLASS_PREFIX}--item-body`, children: [_jsx("div", { className: `${CLASS_PREFIX}--item-title`, title: title, children: cutFileTitle(title) }), formType !== 'read' && (_jsx("div", { className: `${CLASS_PREFIX}--item-size`, children: fileSizeObj[fileID] || '--' })), _jsx("div", { className: `${CLASS_PREFIX}--item-status`, children: _jsx(UploadFileStatus, {}) }), _jsx("div", { className: `${CLASS_PREFIX}--item-action`, children: _jsx(UploadFileAction, { title: title, disabled: disabled, status: "2", fileID: fileID, src: src, readOnly: readOnly }) })] }));
+    return (_jsxs("div", { className: `${CLASS_PREFIX}--item ${CLASS_PREFIX}--item-body`, children: [_jsx("div", { className: `${CLASS_PREFIX}--item-title ${CLASS_PREFIX}--item-value`, title: title, children: cutFileTitle(title) }), formType !== 'read' && (_jsx("div", { className: `${CLASS_PREFIX}--item-size ${CLASS_PREFIX}--item-value`, children: ((_a = fileSizeObj[fileID]) === null || _a === void 0 ? void 0 : _a.size) || '--' })), _jsx("div", { className: `${CLASS_PREFIX}--item-status ${CLASS_PREFIX}--item-value`, children: _jsx(UploadFileStatus, {}) }), _jsx("div", { className: `${CLASS_PREFIX}--item-action ${CLASS_PREFIX}--item-value`, children: _jsx(UploadFileAction, { title: title, disabled: disabled, status: "2", fileID: fileID, src: src, readOnly: readOnly }) })] }));
 };
 /**
  * 基于 File 上传文件过程表格行组件
@@ -209,7 +259,8 @@ const TcbFileUpload = ({ file, disabled, formType }) => {
                     setPercent(percent < 100 ? percent : 100);
                 },
             });
-            !cancelRef.current && (onChange === null || onChange === void 0 ? void 0 : onChange({ fileID, type: 'add', uuid, size }));
+            !cancelRef.current &&
+                (onChange === null || onChange === void 0 ? void 0 : onChange({ fileID, type: 'add', uuid, size, file }));
             setStatus('2');
         }
         catch (e) {
@@ -217,7 +268,7 @@ const TcbFileUpload = ({ file, disabled, formType }) => {
             events.error && events.error(e);
         }
     };
-    return (_jsxs("div", { className: `${CLASS_PREFIX}--item ${CLASS_PREFIX}--item-body`, children: [_jsx("div", { className: `${CLASS_PREFIX}--item-title`, title: title, children: cutFileTitle(title) }), formType !== 'read' && (_jsx("div", { className: `${CLASS_PREFIX}--item-size`, children: size })), _jsx("div", { className: `${CLASS_PREFIX}--item-status`, children: _jsx(UploadFileStatus, { status: status, percent: percent }) }), _jsx("div", { className: `${CLASS_PREFIX}--item-action`, children: _jsx(UploadFileAction, { file: file, uuid: file === null || file === void 0 ? void 0 : file._uuid, status: status, onCancel: (uuid) => {
+    return (_jsxs("div", { className: `${CLASS_PREFIX}--item ${CLASS_PREFIX}--item-body`, children: [_jsx("div", { className: `${CLASS_PREFIX}--item-title  ${CLASS_PREFIX}--item-value`, title: title, children: cutFileTitle(title) }), formType !== 'read' && (_jsx("div", { className: `${CLASS_PREFIX}--item-size ${CLASS_PREFIX}--item-value`, children: size })), _jsx("div", { className: `${CLASS_PREFIX}--item-status ${CLASS_PREFIX}--item-value`, children: _jsx(UploadFileStatus, { status: status, percent: percent }) }), _jsx("div", { className: `${CLASS_PREFIX}--item-action ${CLASS_PREFIX}--item-value`, children: _jsx(UploadFileAction, { file: file, uuid: file === null || file === void 0 ? void 0 : file._uuid, status: status, onCancel: (uuid) => {
                         cancelRef.current = uuid;
                         onChange === null || onChange === void 0 ? void 0 : onChange({ type: 'delete', uuid });
                     }, disabled: disabled, onReLoad: handleUpload, readOnly: formType === 'read' }) })] }));
@@ -226,11 +277,11 @@ const TcbFileUpload = ({ file, disabled, formType }) => {
  * 上传文件状态组件
  */
 const UploadFileStatus = ({ status = '2', percent = 0 }) => {
-    var _a, _b;
+    var _a;
     if (status == '1' && percent) {
         return (_jsxs(_Fragment, { children: [_jsx(Icon, { type: "loading" }), "\u4E0A\u4F20", percent, "% ..."] }));
     }
-    return (_jsxs(_Fragment, { children: [_jsx(Icon, { type: ((_a = statusMap[status]) === null || _a === void 0 ? void 0 : _a.icon) || statusMap['0'].icon }), ((_b = statusMap[status]) === null || _b === void 0 ? void 0 : _b.title) || statusMap['0'].title] }));
+    return (_jsx(_Fragment, { children: ((_a = statusMap[status]) === null || _a === void 0 ? void 0 : _a.title) || statusMap['0'].title }));
 };
 /**
  * 操作列组件, onChange 从最外层 UploadFilePc 传进来
@@ -241,25 +292,29 @@ const UploadFileAction = ({ title = 'downfile', status = '0', fileID = '', uuid
     // 操作列按钮-删除
     const renderDelete = () => isEdit &&
         deleteVisible &&
-        !readOnly && (_jsx(Button, { type: "link", disabled: disabled, onClick: () => onChange === null || onChange === void 0 ? void 0 : onChange({ fileID, uuid, type: 'delete' }), children: "\u5220\u9664" }));
+        !readOnly && (_jsx(WdButton, { text: "\u5220\u9664", size: "sm", variant: "link", disabled: disabled, events: { tap: () => onChange === null || onChange === void 0 ? void 0 : onChange({ fileID, uuid, type: 'delete' }) } }));
     // 操作列按钮-取消
-    const renderCancel = () => isEdit && (_jsx(Button, { onClick: () => onCancel === null || onCancel === void 0 ? void 0 : onCancel(uuid), type: "link", children: "\u53D6\u6D88" }));
+    const renderCancel = () => isEdit && (_jsx(WdButton, { events: { tap: () => onCancel === null || onCancel === void 0 ? void 0 : onCancel(uuid) }, variant: "link", text: "\u53D6\u6D88", size: "sm" }));
     // 操作列按钮-重新上传
-    const renderReLoad = () => isEdit && (_jsx(Button, { type: "link", onClick: () => {
-            onReLoad === null || onReLoad === void 0 ? void 0 : onReLoad(file);
-        }, children: "\u91CD\u65B0\u4E0A\u4F20" }));
+    const renderReLoad = () => isEdit && (_jsx(WdButton, { text: "\u91CD\u65B0\u4E0A\u4F20", size: "sm", variant: "link", events: {
+            tap: () => {
+                onReLoad === null || onReLoad === void 0 ? void 0 : onReLoad(file);
+            },
+        } }));
     // 操作列按钮-下载
-    const renderDownLoad = () => downloadVisible &&
-        !isWebInMiniprogram() && (_jsx(Button, { type: "link", title: "\u70B9\u51FB\u4E0B\u8F7D\u6587\u4EF6", onClick: () => downloadFile(src, title), children: "\u4E0B\u8F7D" }));
+    const renderDownLoad = () => {
+        return (downloadVisible &&
+            !isWebInMiniprogram() && (_jsx("a", { download: title, href: src, target: "_blank", rel: "noreferrer", children: _jsx(WdButton, { text: "\u4E0B\u8F7D", size: "sm", variant: "link", children: "\u4E0B\u8F7D" }) })));
+    };
     switch (status) {
         case '0':
             return renderCancel();
         case '1':
             return renderCancel();
         case '2':
-            return (_jsxs(_Fragment, { children: [renderDelete(), renderDownLoad()] }));
+            return (_jsxs(_Fragment, { children: [renderDownLoad(), renderDelete()] }));
         case '3':
-            return (_jsxs(_Fragment, { children: [renderDelete(), renderReLoad()] }));
+            return (_jsxs(_Fragment, { children: [renderReLoad(), renderDelete()] }));
         default:
             return null;
     }

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

@@ -79,7 +79,8 @@ export const fetchUserListByIds = async (selectUserIds = [], request) => {
         }
         const results = await Promise.all(promises);
         for (const res of results) {
-            if (res.UserList &&
+            if (res &&
+                res.UserList &&
                 Array.isArray(res.UserList) &&
                 res.UserList.length > 0) {
                 records.push(...res.UserList);
@@ -88,7 +89,7 @@ export const fetchUserListByIds = async (selectUserIds = [], request) => {
         return records;
     }
     catch (error) {
-        console.error('错误', error);
+        // console.error('错误', error);
         throw errorHandle(error, 'DescribeWedaUsersRuntime');
     }
 };
@@ -100,7 +101,8 @@ export const fetchUserListByIds = async (selectUserIds = [], request) => {
  * @returns
  */
 export const fetchUserData = async (props, request) => {
-    const { pageNo, pageSize } = props;
+    const { pageNo, pageSize, corpScopes } = props;
+    const QueryWhereList = transCorpScopes(corpScopes);
     try {
         let records = [];
         let total = 0;
@@ -110,6 +112,7 @@ export const fetchUserData = async (props, request) => {
             UserType: 'internalUser',
             NeedPrimaryColumn: true,
             IsNoRelatedOrgFlag: true,
+            QueryWhereList,
         };
         const data = await request('DescribeWedaUsersRuntime', noOrgParams);
         if (data === null || data === void 0 ? void 0 : data.UserList) {
@@ -119,15 +122,20 @@ export const fetchUserData = async (props, request) => {
         return { records, total };
     }
     catch (error) {
-        console.error('错误', error);
+        // console.error('错误', error);
         throw errorHandle(error, 'DescribeWedaUsersRuntime');
     }
 };
+const getCondition = (where) => {
+    if (where == null)
+        return null;
+    return typeof where === 'object' ? JSON.stringify(where) : where;
+};
 export const fetchSearchUser = async (props, request) => {
     const { key, where } = props;
     const { Users = [] } = await request('SearchByCondition', {
         KeyWords: key.trim(),
-        condition: typeof where === 'object' ? JSON.stringify(where) : where,
+        condition: getCondition(where),
         orderBy: props === null || props === void 0 ? void 0 : props.orderBy,
         orderType: props === null || props === void 0 ? void 0 : props.orderType,
         SearchCondition: {
@@ -141,18 +149,15 @@ export const fetchSearchUser = async (props, request) => {
  * 根据orgid获取节点下用户分页数据
  */
 export const fetchUserList = (params, request) => {
-    const { pageNo, pageSize } = params;
     // eslint-disable-next-line no-useless-catch
     try {
         if ((params === null || params === void 0 ? void 0 : params.OrgId) === 'isNoOrgList') {
-            return fetchUserData({ pageNo, pageSize }, request).then((res) => {
+            return fetchUserData({ ...params }, request).then((res) => {
                 return { records: dealUserData(res === null || res === void 0 ? void 0 : res.records), total: res === null || res === void 0 ? void 0 : res.total };
             });
         }
         else {
-            return fetchUsersByOrgId({
-                ...params,
-            }, request).then((res) => {
+            return fetchUsersByOrgId({ ...params }, request).then((res) => {
                 return { records: dealUserData(res === null || res === void 0 ? void 0 : res.records), total: res === null || res === void 0 ? void 0 : res.total };
             });
         }
@@ -175,9 +180,7 @@ async function fetchUsersByOrgId(params, request) {
             pageNo: params === null || params === void 0 ? void 0 : params.pageNo,
             pageSize: params === null || params === void 0 ? void 0 : params.pageSize,
             OrgId: params === null || params === void 0 ? void 0 : params.OrgId,
-            condition: typeof params.where === 'object'
-                ? JSON.stringify(params.where)
-                : params.where,
+            condition: getCondition(params.where),
             orderBy: params === null || params === void 0 ? void 0 : params.orderBy,
             orderType: params === null || params === void 0 ? void 0 : params.orderType,
             DescribeCondition: {
@@ -195,6 +198,28 @@ async function fetchUsersByOrgId(params, request) {
         throw errorHandle(error, 'LazyDescribeOrgs');
     }
 }
+// corpScopes 转 query
+function transCorpScopes(corpScopes) {
+    let queryList;
+    if (Array.isArray(corpScopes) && corpScopes.length > 0) {
+        queryList = [];
+        if (corpScopes.length === 1) {
+            queryList.push({
+                Key: '_organizationId',
+                Rel: 'eq',
+                Val: corpScopes[0],
+            });
+        }
+        else {
+            queryList.push({
+                Key: '_organizationId',
+                Rel: 'in',
+                Val: corpScopes,
+            });
+        }
+    }
+    return queryList;
+}
 /**
  *获取全量组织数据
  */
@@ -202,25 +227,7 @@ export const DescribeOrgs = async (request, params) => {
     try {
         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],
-                });
-            }
-            else {
-                queryList.push({
-                    Key: '_organizationId',
-                    Rel: 'in',
-                    Val: corpScopes,
-                });
-            }
-        }
-        const QueryWhereList = queryList.length > 0 ? queryList : undefined;
+        const QueryWhereList = transCorpScopes(params === null || params === void 0 ? void 0 : params.corpScopes);
         const result = await request('DescribeOrgs', {
             pageNo: 1,
             pageSize: PAGE_SIZE,

package/dist/web/components/form/userOrgSelect/common/types.d.ts

@@ -63,6 +63,7 @@ export interface IUserTreeSelect extends CommonFormPropsType {
     /** 点击确认时所选用户的值变更 */
     onConfirmSelectUser: (selectedUserList: IUserList[]) => void;
     secondDisplay: string;
+    onDelete?: any;
     naked?: boolean;
     containerClass?: string;
     triggerElement?: React.ReactNode;
@@ -132,6 +133,7 @@ export interface IFetchNoOrgUsersParams {
     pageNo?: number;
     pageSize?: number;
     NeedPrimaryColumn?: boolean;
+    corpScopes?: any;
 }
 export interface IUserList {
     id: string;

package/dist/web/components/form/userOrgSelect/component/depart-breadcrumb.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export declare const DepartBreadcrumb: (props: any) => JSX.Element;

package/dist/web/components/form/userOrgSelect/component/depart-select/depart-select-pc.js

@@ -42,7 +42,7 @@ export function DepartTreeSelectPC({ id, className, style, label = '部门选择
                 }, appearance: 'button', button: _jsx(InputTags, { tagsList: confirmOrgList, placeholder: placeholder, multiple: multiple, errInfo: errorInfo, disabled: disabled, onClose: (e, item) => {
                         setConfirmOrgList(confirmOrgList.filter((l) => (l === null || l === void 0 ? void 0 : l.id) !== (item === null || item === void 0 ? void 0 : item.id)));
                         e.stopPropagation();
-                    } }), overlayClassName: 'weda-ui-user-selected-overlay-hidden', style: { width: '100%' }, disabled: disabled, children: _jsx(OrgModalPC, { open: open, setOpen: setOpen, request: request, onConfirm: onConfirm, onCancel: onCancel, treeData: treeData || [], orgList: orgList || [], treeDataError: error }) })) }) }))({
+                    } }), overlayClassName: 'weda-ui-user-selected-overlay-hidden', style: { width: '100%' }, disabled: disabled, children: _jsx(OrgModalPC, { open: open, setOpen: setOpen, request: request, onConfirm: onConfirm, onCancel: onCancel, treeData: treeData || [], orgList: orgList || [], treeDataError: error }) })) }) }), decorator)({
         id,
         className: cls,
         style,
@@ -51,6 +51,5 @@ export function DepartTreeSelectPC({ id, className, style, label = '部门选择
         multiCell: false,
         requiredFlag,
         size,
-        decorator,
     });
 }

package/dist/web/components/form/userOrgSelect/component/depart-select/index.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useCallback } from 'react';
 import { ConfigProvider } from 'tea-component';
 import { useSyncValue } from '../../../../../utils/hooks/useSyncValue';
 import { usePlatform, isInIde } from '../../../../../utils/platform';
@@ -12,6 +12,7 @@ import { defaultRequest, getDepartByIds, } from '../../common/fetch-data-service
 import { setFlag, formatTree, parseStrToArr, setChildren, } from '../../common/utils';
 import { useDepartData } from '../../hooks/use-depart-data';
 import './style';
+import { useDeepCompareEffect } from '@react-hookz/web';
 export default function DepartTreeSelect(props) {
     const { events = emptyObject, defaultValue = emptyArray, //默认值，支持数组
     confirmValue = '', defaultValueType = 'noneDepart', multiple = false, onChange = null, request = defaultRequest, departmentScope, } = props;
@@ -33,6 +34,7 @@ export default function DepartTreeSelect(props) {
     });
     const [treeData, setTreeData] = useState([]);
     const defaultExpandedIds = parseStrToArr(departmentScope);
+    const triggerEventRef = React.useRef(false);
     useEffect(() => {
         if (orgTreeData) {
             // deepClone数组，变更对象指针，避免数据混乱
@@ -62,7 +64,7 @@ export default function DepartTreeSelect(props) {
             try {
                 setErrorInfo({ errorStatus: false, errorMessage: null });
                 if (ids && ids.length !== 0 && !isInIde()) {
-                    const { orgList } = await getDepartByIds({ ids, request });
+                    const { orgList } = (await getDepartByIds({ ids, request })) || {};
                     setConfirmOrgList(orgList || []);
                 }
                 else {
@@ -83,7 +85,7 @@ export default function DepartTreeSelect(props) {
         catch (e) { }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [defaultValueType, confirmOrgIds]);
-    useEffect(() => {
+    useDeepCompareEffect(() => {
         var _a, _b, _c;
         setSelectedOrgList(confirmOrgList);
         onChange === null || onChange === void 0 ? void 0 : onChange(multiple
@@ -93,25 +95,31 @@ export default function DepartTreeSelect(props) {
                 })
                 : null
             : (_a = confirmOrgList[0]) === null || _a === void 0 ? void 0 : _a.id);
-        (_b = events === null || events === void 0 ? void 0 : events.change) === null || _b === void 0 ? void 0 : _b.call(events, multiple
-            ? {
-                value: confirmOrgList.length > 0
-                    ? confirmOrgList.map((e) => {
-                        return e === null || e === void 0 ? void 0 : e.id;
-                    })
-                    : null,
-                data: confirmOrgList,
-            }
-            : {
-                value: ((_c = confirmOrgList[0]) === null || _c === void 0 ? void 0 : _c.id) || null,
-                data: confirmOrgList[0] || null,
-            });
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        if (triggerEventRef.current) {
+            (_b = events === null || events === void 0 ? void 0 : events.change) === null || _b === void 0 ? void 0 : _b.call(events, multiple
+                ? {
+                    value: confirmOrgList.length > 0
+                        ? confirmOrgList.map((e) => {
+                            return e === null || e === void 0 ? void 0 : e.id;
+                        })
+                        : null,
+                    data: confirmOrgList,
+                }
+                : {
+                    value: ((_c = confirmOrgList[0]) === null || _c === void 0 ? void 0 : _c.id) || null,
+                    data: confirmOrgList[0] || null,
+                });
+            triggerEventRef.current = false;
+        }
     }, [confirmOrgList]);
+    const _setConfirmOrgList = useCallback((v) => {
+        triggerEventRef.current = true;
+        setConfirmOrgList(v);
+    }, []);
     const restProps = {
         confirmOrgIds,
         confirmOrgList,
-        setConfirmOrgList,
+        setConfirmOrgList: _setConfirmOrgList,
         selectedOrgList,
         setSelectedOrgList,
         errorInfo,

package/dist/web/components/form/userOrgSelect/component/depart-select/org-modal-pc.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 import '../index.css';
 export declare const OrgModalPC: (props: any) => JSX.Element;

package/dist/web/components/form/userOrgSelect/component/depart-select/org-modal-pc.js

@@ -1,12 +1,13 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useState, useCallback, useMemo } from 'react';
-import { Button, Modal, Bubble } from 'tea-component';
+import { Modal, Bubble } from 'tea-component';
 import { ModalSearch } from '../modal-search';
 import { OrgTreeContext } from './depart-select-pc';
 import { OrgTree } from '../org-tree';
 import { SelectedList } from '../selected-list';
 import { fetchSearchOrg } from '../../common/utils';
 import debounce from '../../../../../utils/debounce';
+import { WdButton } from '../../../../wd-button';
 import '../index.css';
 export const OrgModalPC = (props) => {
     const { open, setOpen, onCancel, onConfirm, treeData, orgList, treeDataError, } = props;
@@ -43,7 +44,7 @@ export const OrgModalPC = (props) => {
         const items = [];
         if (ids.length > 0) {
             for (const id of ids) {
-                const item = orgList.find((i) => i.id === id);
+                const item = orgList === null || orgList === void 0 ? void 0 : orgList.find((i) => i.id === id);
                 if (item) {
                     items.push(item);
                 }
@@ -53,11 +54,12 @@ export const OrgModalPC = (props) => {
             setSelectedOrgList(items);
         }
     }, [orgList, setSelectedOrgList]);
+    const btnDisabled = selectedOrgList.length === 0 && confirmOrgList.length === 0;
     return (_jsxs(Modal, { disableEscape: true, maskClosable: false, visible: open, caption: "\u9009\u62E9\u90E8\u95E8", onClose: () => setOpen(false), className: "weda-ui weda-ui-user-select-modal", children: [_jsxs(Modal.Body, { children: [_jsxs("div", { className: "weda-ui-user-select-container", children: [_jsx(ModalSearch, { searchList: searchOrgList, errInfo: errInfo, loading: loading, keyWords: keyWords, selectedList: selectedOrgList, multiple: multiple, setSelectedList: setSelectedOrgList, setSelectedIds: handleSelectedIdsChange, selectedIds: selectedIds, onSearch: (key) => onSearch(key), onReset: () => setSearchOrgList([]), isUser: false }), keyWords.length === 0 && (_jsx(_Fragment, { children: _jsx("div", { className: "weda-ui-user-select-container-list", children: _jsx("div", { className: "weda-ui-user-select-container-list__start", children: _jsx(OrgTree, { selectedOrgId: selectedIds, mutiple: multiple, 
                                             //setSelectedOrgId={setSelectedOrgId}
                                             isUser: false, treeData: treeData, treeDataError: treeDataError, selectable: true, defaultExpandedIds: defaultExpandedIds, onActive: (ids) => handleSelectedIdsChange(ids) }) }) }) }))] }), _jsx(SelectedList, { selectedList: selectedOrgList, isUser: false, onClose: (item) => {
                             setSelectedOrgList(selectedOrgList.filter((data) => data.id !== (item === null || item === void 0 ? void 0 : item.id)));
-                        } })] }), _jsxs(Modal.Footer, { children: [_jsx(Button, { type: "weak", onClick: onCancel, children: "\u53D6\u6D88" }), _jsx(Bubble, { content: selectedOrgList.length === 0 && confirmOrgList.length === 0
+                        } })] }), _jsxs(Modal.Footer, { children: [_jsx(WdButton, { text: "\u53D6\u6D88", events: { tap: onCancel }, theme: "secondary", variant: "outline", className: "wd-btn__margin-right" }), _jsx(Bubble, { content: selectedOrgList.length === 0 && confirmOrgList.length === 0
                             ? '请选择部门'
-                            : null, children: _jsx(Button, { type: "primary", onClick: onConfirm, disabled: selectedOrgList.length === 0 && confirmOrgList.length === 0, children: "\u786E\u5B9A" }) })] })] }));
+                            : null, children: _jsx("span", { children: _jsx(WdButton, { text: "\u786E\u5B9A", events: { tap: onConfirm }, disabled: btnDisabled }) }) })] })] }));
 };

package/dist/web/components/form/userOrgSelect/component/error-tips.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export declare const ErrorStatus: ({ description, title }: {
     description: any;
     title?: string;

package/dist/web/components/form/userOrgSelect/component/index.css

@@ -63,14 +63,14 @@
   .depart-tree
   .wedatea2td-tree__node.is-selected
   > .wedatea2td-tree__node-content {
-  background-color: #d4e3fc;
+  background-color: var(--wd-color-brand-light, #d4e3fc);
 }
 .weda-ui-user-select-container-list__start
   .depart-tree
   .wedatea2td-tree__node.is-selected
   > .wedatea2td-tree__node-content
   .wedatea2td-tree__label {
-  background-color: #d4e3fc;
+  background-color: var(--wd-color-brand-light, #d4e3fc);
 }
 .weda-ui-user-select-container-list__start
   .wedatea2td-tree.wedatea2td-tree--checkbox-separate
@@ -78,7 +78,7 @@
   > .wedatea2td-tree__node-content
   .wedatea2td-tree__label
   .wedatea2td-tree__label-title {
-  background-color: #d4e3fc;
+  background-color: var(--wd-color-brand-light, #d4e3fc);
 }
 
 /* 弹窗内容 列表头部信息容器 */
@@ -278,7 +278,7 @@
 }
 
 .weda-select-user-dept-breadcrumb__item.is-selected {
-  color: #0052d9;
+  color: var(--wd-color-brand, #0052d9);
 }
 
 .weda-select-user-dept-breadcrumb__separate {
@@ -373,3 +373,7 @@
   overflow: hidden;
   text-overflow: ellipsis;
 }
+
+.wd-user-model__btn {
+  margin-right: 5px;
+}

package/dist/web/components/form/userOrgSelect/component/input-tags.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 import { IInputTags } from '../common/types';
 export declare const InputTags: ({ tagsList, placeholder, onClose, multiple, errInfo, disabled, platForm, readOnly, }: IInputTags) => JSX.Element;