@cloudbase/weda-ui 3.4.0 → 3.4.2

package/dist/configs/index.js

@@ -33,6 +33,7 @@ import NavLayout from './components/navLayout.json';
 import WedaVideo from './components/wedaVideo.json';
 import showToast from './actions/showToast.json';
 import showModal from './actions/showModal.json';
+import showMessage from './actions/showMessage.json';
 import ListView from './components/listView.json';
 import NavigationBar from './components/navigationBar.json';
 import Line from './components/chart/line.json';
@@ -104,6 +105,7 @@ export const components = {
 export const actions = {
     showToast,
     showModal,
+    showMessage,
 };
 export default {
     components,

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

@@ -1,2 +1,3 @@
 export { default as showToast } from "./showToast";
 export { default as showModal } from "./showModal";
+export { default as showMessage } from "./showMessage";

package/dist/web/actions/index.js

@@ -1,2 +1,3 @@
 export { default as showToast } from './showToast';
 export { default as showModal } from './showModal';
+export { default as showMessage } from './showMessage';

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

@@ -0,0 +1,6 @@
+.weda-showmessage__none > .wedatea2td-icon {
+  display: none;
+}
+
+/*# sourceURL=webpack://./src/web/actions/showMessage/index.css */
+/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8uL3NyYy93ZWIvYWN0aW9ucy9zaG93TWVzc2FnZS9pbmRleC5jc3MiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7RUFDRSxhQUFhO0FBQ2YiLCJzb3VyY2VzQ29udGVudCI6WyIud2VkYS1zaG93bWVzc2FnZV9fbm9uZSA+IC53ZWRhdGVhMnRkLWljb24ge1xuICBkaXNwbGF5OiBub25lO1xufVxuIl0sInNvdXJjZVJvb3QiOiIifQ== */

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

@@ -0,0 +1,17 @@
+import type { unknownFunction } from '../../types';
+import './index.css';
+interface messageProps {
+    data: {
+        title?: string;
+        icon?: 'success' | 'error' | 'warning' | 'loading' | 'none';
+        duration?: number;
+    };
+    _origin?: (params: {
+        title?: string;
+        icon?: string;
+        duration?: number;
+    }) => void;
+    event: Record<string, unknownFunction>;
+}
+export default function showMessage(props: messageProps): void;
+export {};

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

@@ -0,0 +1,39 @@
+import { isH5Platform } from '../../utils/platform';
+import { message } from 'tea-component';
+import './index.css';
+const iconType = {
+    success: 'success',
+    error: 'error',
+    warning: 'warning',
+    loading: 'loading',
+    none: 'none',
+};
+export default function showMessage(props) {
+    var _a, _b, _c, _d;
+    try {
+        const { data: { title, icon = 'none', duration = 1500 }, _origin, } = props;
+        const smallScreen = (_b = (_a = window === null || window === void 0 ? void 0 : window.matchMedia('(max-width: 1024px)')) === null || _a === void 0 ? void 0 : _a.matches) !== null && _b !== void 0 ? _b : isH5Platform();
+        const touchDevice = (_d = (_c = window === null || window === void 0 ? void 0 : window.matchMedia('(pointer:coarse)')) === null || _c === void 0 ? void 0 : _c.matches) !== null && _d !== void 0 ? _d : smallScreen;
+        const platform = touchDevice || smallScreen ? 'h5' : 'pc';
+        if (platform === 'h5') {
+            _origin &&
+                _origin({
+                    title: title,
+                    icon,
+                    duration: duration || 1500,
+                });
+        }
+        else {
+            const realIcon = iconType[icon];
+            const isNotShowIcon = realIcon === 'none' || !realIcon;
+            message[isNotShowIcon ? 'success' : icon]({
+                className: `weda-showmessage__${icon}`,
+                content: title,
+                duration: duration || 1500,
+            });
+        }
+    }
+    catch (error) {
+        console.error('showMessage error', error);
+    }
+}

package/dist/web/components/button/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
-import type { CommonPropsType } from '../../types';
+import type { CommonPropsType, unknownFunction } from '../../types';
 import './index.css';
-declare const Button: ({ text, size, type, contentSlot, formType, loading, disabled, events, className, style, id, }: PropsType) => JSX.Element;
+declare const Button: ({ text, size, type, contentSlot, formType, loading, disabled, events, className, style, id, ...props }: PropsType) => JSX.Element;
 export interface PropsType extends CommonPropsType {
     /**
      * 内容
@@ -28,5 +28,6 @@ export interface PropsType extends CommonPropsType {
      */
     formType?: 'button' | 'submit' | 'reset';
     contentSlot?: string;
+    [handlers: `on${string}`]: unknownFunction;
 }
 export default Button;

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

@@ -5,7 +5,7 @@ import { usePlatform } from '../../utils/platform';
 import './index.css';
 import { emptyObject } from '../../utils/constant';
 // 不用 react-weui 而直接用底层实现的原因是 react-weui 不能支持表单类型
-const Button = ({ text, size, type, contentSlot, formType, loading, disabled, events = emptyObject, className, style, id, }) => {
+const Button = ({ text, size, type, contentSlot, formType, loading, disabled, events = emptyObject, className, style, id, ...props }) => {
     const platform = usePlatform();
     const isH5 = platform === 'h5';
     const cls = classNames({
@@ -23,18 +23,29 @@ const Button = ({ text, size, type, contentSlot, formType, loading, disabled, ev
         [className]: className,
     });
     const onClick = (e) => {
+        var _a;
         if (events.tap) {
             events.tap({}, { originEvent: e });
         }
+        (_a = props === null || props === void 0 ? void 0 : props.onClick) === null || _a === void 0 ? void 0 : _a.call(props, e);
     };
+    const propsStartWithOn = React.useMemo(() => {
+        return Object.keys(props).reduce((acc, cur) => {
+            if (cur.startsWith('on')) {
+                acc[cur] = props[cur];
+            }
+            return acc;
+        }, {});
+    }, [props]);
+    const teaBtnType = React.useMemo(() => toTeaButtonType(type), [type]);
     if (platform === 'h5') {
-        return (React.createElement("button", { className: cls, disabled: disabled, type: formType, style: style, id: id, onClick: onClick },
+        return (React.createElement("button", { className: cls, disabled: disabled, type: formType, style: style, id: id, ...propsStartWithOn, onClick: onClick },
             loading && (React.createElement("span", { className: "weui-btn_loading" },
                 React.createElement("i", { className: "weui-loading" }))),
             text ? text : contentSlot));
     }
     return (React.createElement(ConfigProvider, { classPrefix: "wedatea2td" },
-        React.createElement(TeaButton, { loading: loading, onClick: onClick, disabled: disabled, htmlType: formType, type: toTeaButtonType(type), style: style, className: cls, id: id }, text ? text : contentSlot)));
+        React.createElement(TeaButton, { loading: loading, disabled: disabled, htmlType: formType, type: teaBtnType, style: style, className: cls, id: id, ...propsStartWithOn, onClick: onClick }, text ? text : contentSlot)));
 };
 function toTeaButtonType(type) {
     if (type === 'primary')

package/dist/web/components/common/use-loop-render-detect.js

@@ -1,5 +1,6 @@
 import { useSyncedRef } from '@react-hookz/web';
 import { useCallback, useEffect, useRef } from 'react';
+import { debug } from '../../utils/console';
 export const useRenderCount = () => {
     const countRef = useRef(0);
     const syncedRef = useSyncedRef(++countRef.current);
@@ -104,12 +105,12 @@ export const useLoopRenderDetect = (inputOptions = defaultOptions) => {
         };
     }, []);
     const fps = useFps();
-    // console.log({
-    //   timeWindow: options.timeWindowMs,
-    //   fps,
-    //   renderCount,
-    //   limit: options.limit,
-    // });
+    debug('loop:detect').log({
+        timeWindow: options.timeWindowMs,
+        fps,
+        renderCount,
+        limit: options.limit,
+    });
     if ((renderCount > options.limit && fps < 1) ||
         renderCount > options.limit * 3) {
         reset();

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

@@ -5,6 +5,7 @@ import { usePlatform, isInIde } from '../../../utils/platform';
 import { callDataSource, callConnector } from '../../../utils/tcb';
 import weui from '../../../utils/weui';
 import './index.css';
+import isObjectEqual from '../../../utils/isObjectEqual';
 const formTypeWithInitValue = ['edit', 'read'];
 /**
  * 表单容器组件
@@ -20,7 +21,9 @@ export default function Form({ className, contentSlot, style, id, layout, formTy
         'gsd-h5-react-form-pc': platform === 'pc',
         [className]: className,
     });
-    const timeRef = React.useRef(null);
+    const preParamGetItemRef = React.useRef(null);
+    const preDataIdRef = React.useRef(null);
+    const timeoutRef = React.useRef(null);
     React.useEffect(() => {
         const getData = async () => {
             var _a, _b;
@@ -64,12 +67,24 @@ export default function Form({ className, contentSlot, style, id, layout, formTy
             }
         };
         if (dataSourceName && formTypeWithInitValue.includes(formType)) {
-            if ((isDataModel && _id) ||
-                (!isDataModel && paramGetItem && methodGetItem)) {
-                clearTimeout(timeRef.current);
-                // 防抖
+            // https://git.woa.com/QBase/lcap/weda-ui/merge_requests/542 对象要小心死循环
+            if ((isDataModel &&
+                _id &&
+                !isObjectEqual(preDataIdRef.current, _id, true)) ||
+                (!isDataModel &&
+                    paramGetItem &&
+                    methodGetItem &&
+                    !isObjectEqual(preParamGetItemRef.current, paramGetItem))) {
+                if (timeoutRef.current !== null) {
+                    return () => {
+                        clearTimeout(timeoutRef.current);
+                    };
+                }
+                preParamGetItemRef.current = paramGetItem;
+                preDataIdRef.current = _id;
                 // eslint-disable-next-line rulesdir/no-timer
-                timeRef.current = setTimeout(() => getData(), 100);
+                timeoutRef.current = setTimeout(getData, 100);
+                getData();
             }
         }
     }, [
@@ -81,50 +96,6 @@ export default function Form({ className, contentSlot, style, id, layout, formTy
         methodGetItem,
         paramGetItem,
     ]);
-    React.useEffect(() => {
-        // 因编辑器render时序问题暂不上线
-        // 获取字段权限
-        // const authValue = {
-        //   isDataModel,
-        //   dataSourceFields: [],
-        //   dataSourceFieldsWidthAuthList: [],
-        // };
-        // const getDataSourceFieldsWithAuth = async () => {
-        //   try {
-        //     const datasource = await getDataSourceByName(dataSourceName);
-        //     if (!isInIde()) {
-        //       // 判断是否是预览区，编辑器编辑区 dataSourceName 查询的返回一致，编辑区用的本地的数据源数据返回固定
-        //       authValue.dataSourceFieldsWidthAuthList =
-        //         datasource?.resourceCheckInfos?.map((item) => item.ReadWrite);
-        //       authValue.dataSourceFields = Object.keys(
-        //         datasource?.schema?.properties || {}
-        //       );
-        //     }
-        //     events?.onInitDataSourceFieldsWithAuth?.(authValue);
-        //   } catch (err) {
-        //     events?.onInitDataSourceFieldsWithAuth?.(authValue);
-        //     alertError(
-        //       platform,
-        //       `获取数据源字段权限信息失败,字段权限可能无法正确展示,错误信息:${err}`
-        //     );
-        //     console.error('getDataSourceFieldsWithAuth err', err);
-        //   }
-        // };
-        // // 兼容私有环境，新接口不存在的情况，产品策略完善后移除
-        // if (
-        //   window?.['_isPrivate'] &&
-        //   !window?.app?.cloud?.getDataSourceProfileAsync
-        // ) {
-        //   events?.onInitDataSourceFieldsWithAuth?.({ isDataModel });
-        //   return;
-        // }
-        // if (isDataModel && dataSourceName) {
-        //   getDataSourceFieldsWithAuth();
-        // } else {
-        //   // 在表单容器里面的表单元素 if 默认是 false，需要通过onInitDataSourceFieldsWithAuth设置为true
-        //   events?.onInitDataSourceFieldsWithAuth?.({ isDataModel });
-        // }
-    }, [formType, isDataModel, platform, dataSourceName, events]);
     // pc 渲染
     const renderPc = () => {
         return (React.createElement(ConfigProvider, { classPrefix: "wedatea2td" },

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

@@ -138,7 +138,7 @@ export function ImageUploaderH5({ title: label, maxUploadCount, maxSize = 10, ac
                         React.createElement("div", { className: "weui-uploader__file-content" },
                             progress,
                             "%")))),
-                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) => {
+                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: !single, onChange: (e) => {
                         const files = [...e.target.files];
                         if (!islegalType(files, accepts))
                             return;

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

@@ -156,6 +156,8 @@ export function UploaderPCInner(props) {
     };
     // 转换后的属性
     const extraProps = {};
+    //是否支持多选
+    extraProps['multiple'] = !single;
     extraProps['accept'] =
         acceptTypes.includes('image/*') || acceptTypes.length === 0
             ? IMAGE_TYPES

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

@@ -2,7 +2,7 @@ import * as React from 'react';
 import weui from '../../../utils/weui';
 import isObjectEqual from '../../../utils/isObjectEqual';
 import { ConfigProvider, Button, Icon, Text, List, Progress, Tooltip, message, } from 'tea-component';
-import { filterStrList, isCloudFileID, isHttpFileID, transSize, downloadFile, transFileCloudidToName, randomStr, } from '../../../utils/platform';
+import { filterStrList, isCloudFileID, isHttpFileID, transSize, downloadFile, transFileCloudidToName, randomStr, isInIde, } from '../../../utils/platform';
 import { getCloudInstance } from '../../../utils/tcb';
 import classNames from '../../../utils/classnames';
 import { renderDecorator } from '../renderDecorator';
@@ -37,15 +37,17 @@ layout, id = '', style = defaultStyle, labelVisible = true, label = '上传文
 // 组件属性
 tips = '', btnTitle = '点击上传', maxUploadCount = 9, maxSize = 10, deleteVisible = true, downloadVisible = true, value = emptyArray, // 需要兼容 cloud:和https: 协议，需要兼容字符串和字符串数组
 events = emptyObject, defaultValue, uploadPath = 'weda-uploader', single = true, onChange = null, isEdit = true, }) {
-    const [fileIDList, setfileIDList] = React.useState(filterStrList([].concat(defaultValue, value))); // 上传成功文件ID列表，fileID[]
+    const [fileIDList, setfileIDList] = React.useState(isInIde() ? [] : filterStrList([].concat(defaultValue, value))); // 上传成功文件ID列表，fileID[]
     const [fileList, setFileList] = React.useState([]); // 上传中的文件列表，file[]，file为原始文件 + uuid属性
     const [fileSizeObj, setFileSizeObj] = React.useState({}); // 管理上传文件大小 {uuid:size}
     // 两次默认值不同, 需要刷新
     const prevDefaultRef = React.useRef([]);
     const fileRef = React.useRef(fileIDList);
+    const maxSizeLimit = maxSize > 500 ? 500 : maxSize;
     React.useMemo(() => {
         //有有效默认值时不刷新，解决初次渲染默认值不显示问题
-        if (defaultValue &&
+        if (!isInIde() &&
+            defaultValue &&
             !isObjectEqual(prevDefaultRef.current, defaultValue) &&
             (JSON.stringify(prevDefaultRef.current) == '[]' ||
                 !prevDefaultRef.current)) {
@@ -115,7 +117,7 @@ events = emptyObject, defaultValue, uploadPath = 'weda-uploader', single = true,
         multiple: !single,
     };
     tips && (uploadProps['label'] = tips);
-    maxSize && (uploadProps['maxSize'] = maxSize * 1024 * 1024);
+    maxSizeLimit && (uploadProps['maxSize'] = maxSizeLimit * 1024 * 1024);
     const btnDisabled = fileIDList.length >= maxUploadCount ||
         (single && fileIDList.length > 0) ||
         disabled;
@@ -150,9 +152,9 @@ events = emptyObject, defaultValue, uploadPath = 'weda-uploader', single = true,
                                         weui.alert(`上传文件总数不能超过${maxUploadCount}个`);
                                         return false;
                                     }
-                                    if (maxSize &&
-                                        fileList.some((f) => f.size > maxSize * 1024 * 1024)) {
-                                        weui.alert(`请上传不超过${maxSize}M的文件`);
+                                    if (maxSizeLimit &&
+                                        fileList.some((f) => f.size > maxSizeLimit * 1024 * 1024)) {
+                                        weui.alert(`请上传不超过${maxSizeLimit}M的文件`);
                                         return false;
                                     }
                                     if (fileList.some((f) => f.size > 1024 * 1024 * 1024)) {
@@ -203,7 +205,7 @@ const TcbFileEcho = ({ fileID, disabled }) => {
         React.createElement("div", { className: `${CLASS_PREFIX}__item-left` },
             React.createElement(UploadFileStatus, { title: label, size: fileSizeObj[fileID] || '--' })),
         React.createElement("div", { className: `${CLASS_PREFIX}__btn-group` },
-            React.createElement(UploadFileAction, { disabled: disabled, status: "UPLOAD_STATUS_SUCCESS", fileID: fileID, src: src }))));
+            React.createElement(UploadFileAction, { title: label, disabled: disabled, status: "UPLOAD_STATUS_SUCCESS", fileID: fileID, src: src }))));
 };
 /**
  * 基于 File 上传文件过程组件
@@ -296,7 +298,7 @@ const UploadFileStatus = ({ status = 'UPLOAD_STATUS_SUCCESS', percent = 0, size,
  * 操作列组件, onChange 从最外层 UploadFilePc 传进来
  * props: { status, fileID, uuid, src, onChange }
  */
-const UploadFileAction = ({ status = 'UPLOAD_STATUS_PENDING', fileID = '', uuid = '', src = '', file = null, onReLoad = null, onCancel = null, disabled, }) => {
+const UploadFileAction = ({ status = 'UPLOAD_STATUS_PENDING', fileID = '', uuid = '', src = '', file = null, onReLoad = null, onCancel = null, disabled, title = 'downfile', }) => {
     const { onChange, downloadVisible, deleteVisible, isEdit } = React.useContext(FileContext) || {};
     // 操作列按钮-删除
     const renderDelete = () => isEdit && (React.createElement(Button, { icon: "delete", onClick: () => onChange === null || onChange === void 0 ? void 0 : onChange({ fileID, uuid, type: 'delete' }), disabled: disabled }));
@@ -307,7 +309,7 @@ const UploadFileAction = ({ status = 'UPLOAD_STATUS_PENDING', fileID = '', uuid
             onReLoad === null || onReLoad === void 0 ? void 0 : onReLoad(file);
         } }));
     // 操作列按钮-下载
-    const renderDownLoad = () => (React.createElement(Button, { icon: "download", onClick: () => downloadFile(src) }));
+    const renderDownLoad = () => (React.createElement(Button, { icon: "download", onClick: () => downloadFile(src, title) }));
     switch (status) {
         case 'UPLOAD_STATUS_PENDING':
             return renderCancel();

package/dist/web/components/form/uploaderFile/uploadFile.pc.d.ts

@@ -22,3 +22,14 @@ export interface IUploaderFilePc extends CommonFormPropsType {
     isEdit?: boolean;
     onChange?: unknownFunction;
 }
+export interface IUploadFileAction {
+    status?: string;
+    fileID?: string;
+    uuid?: string;
+    src?: string;
+    file?: any;
+    onReLoad?: any;
+    onCancel?: any;
+    disabled: boolean;
+    title?: string;
+}

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { Upload, ConfigProvider, Button, message, Icon, Text, List, } from 'tea-component';
-import { filterStrList, isCloudFileID, isHttpFileID, transSize, downloadFile, cutFileTitle, transFileCloudidToName, randomStr, } from '../../../utils/platform';
+import { filterStrList, isCloudFileID, isHttpFileID, transSize, downloadFile, cutFileTitle, transFileCloudidToName, randomStr, isInIde, } from '../../../utils/platform';
 import { getCloudInstance } from '../../../utils/tcb';
 import classNames from '../../../utils/classnames';
 import { renderDecorator } from '../renderDecorator';
@@ -28,15 +28,17 @@ 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, }) {
-    const [fileIDList, setfileIDList] = React.useState(filterStrList([].concat(defaultValue, value))); // 上传成功文件ID列表，fileID[]
+    const [fileIDList, setfileIDList] = React.useState(isInIde() ? [] : filterStrList([].concat(defaultValue, value))); // 上传成功文件ID列表，fileID[]
     const [fileList, setFileList] = React.useState([]); // 上传中的文件列表，file[]，file为原始文件 + uuid属性
     const [fileSizeObj, setFileSizeObj] = React.useState({}); // 管理上传文件大小 {uuid:size}
     // 两次默认值不同, 需要刷新
     const prevDefaultRef = React.useRef([]);
     const fileRef = React.useRef(fileIDList);
+    const maxSizeLimit = maxSize > 500 ? 500 : maxSize;
     React.useMemo(() => {
         //有有效默认值时不刷新，解决初次渲染默认值不显示问题
-        if (defaultValue &&
+        if (!isInIde() &&
+            defaultValue &&
             !isObjectEqual(prevDefaultRef.current, defaultValue) &&
             (JSON.stringify(prevDefaultRef.current) == '[]' ||
                 !prevDefaultRef.current)) {
@@ -85,7 +87,7 @@ acceptTypes = emptyArray, downloadVisible = true, deleteVisible = true, uploadPa
                     errorList.push('上传文件类型错误');
                 }
                 if (error.find((item) => (item === null || item === void 0 ? void 0 : item.code) === 'file-too-large')) {
-                    errorList.push(`上传文件大小不能超过${maxSize}M`);
+                    errorList.push(`上传文件大小不能超过${maxSizeLimit}M`);
                 }
                 message.error({ content: errorList.join(', ') });
             }
@@ -116,7 +118,7 @@ acceptTypes = emptyArray, downloadVisible = true, deleteVisible = true, uploadPa
         uploadProps['accept'] = Array.from(new Set(acceptTypes));
     }
     tips && (uploadProps['title'] = tips);
-    maxSize && (uploadProps['maxSize'] = maxSize * 1024 * 1024);
+    maxSize && (uploadProps['maxSize'] = maxSizeLimit * 1024 * 1024);
     const btnDisabled = fileIDList.length >= maxUploadCount || (single && fileIDList.length > 0);
     //验证上传文件类型是否合法
     const islegalType = (files, accepts) => {
@@ -193,7 +195,7 @@ const TcbFileEcho = ({ fileID, disabled }) => {
         React.createElement("div", { className: `${CLASS_PREFIX}--item-status` },
             React.createElement(UploadFileStatus, null)),
         React.createElement("div", { className: `${CLASS_PREFIX}--item-action` },
-            React.createElement(UploadFileAction, { disabled: disabled, status: "2", fileID: fileID, src: src }))));
+            React.createElement(UploadFileAction, { title: title, disabled: disabled, status: "2", fileID: fileID, src: src }))));
 };
 /**
  * 基于 File 上传文件过程表格行组件
@@ -267,7 +269,7 @@ const UploadFileStatus = ({ status = '2', percent = 0 }) => {
  * 操作列组件, onChange 从最外层 UploadFilePc 传进来
  * props: { status, fileID, uuid, src, onChange }
  */
-const UploadFileAction = ({ status = '0', fileID = '', uuid = '', src = '', file = null, onReLoad = null, onCancel = null, disabled, }) => {
+const UploadFileAction = ({ title = 'downfile', status = '0', fileID = '', uuid = '', src = '', file = null, onReLoad = null, onCancel = null, disabled, }) => {
     const { onChange, downloadVisible, deleteVisible, isEdit } = React.useContext(FileContext) || {};
     // 操作列按钮-删除
     const renderDelete = () => isEdit &&
@@ -279,7 +281,7 @@ const UploadFileAction = ({ status = '0', fileID = '', uuid = '', src = '', file
             onReLoad === null || onReLoad === void 0 ? void 0 : onReLoad(file);
         } }, "\u91CD\u65B0\u4E0A\u4F20"));
     // 操作列按钮-下载
-    const renderDownLoad = () => downloadVisible && (React.createElement(Button, { type: "link", title: "\u70B9\u51FB\u4E0B\u8F7D\u6587\u4EF6", onClick: () => downloadFile(src) }, "\u4E0B\u8F7D"));
+    const renderDownLoad = () => downloadVisible && (React.createElement(Button, { type: "link", title: "\u70B9\u51FB\u4E0B\u8F7D\u6587\u4EF6", onClick: () => downloadFile(src, title) }, "\u4E0B\u8F7D"));
     switch (status) {
         case '0':
             return renderCancel();

package/dist/web/components/form/userOrgSelect/comTool.js

@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { SearchBox, Status, Tree, LoadingTip, Button } from 'tea-component';
-import { getNode, dealUserData, dealOrgData } from './utils';
+import { getNode, dealUserData, dealOrgData, getUserDepartID } from './utils';
 import classNames from '../../../utils/classnames';
 export const DimTreeContent = (props) => {
     const { selectedIds, onSelect, onActive, activeIds, treeClassName, data: treeData, setTreeData, onCancel, onConfirm, needUser, onReset, request, errorInfo = { errorStatus: false, errorMessage: '' }, } = props;
@@ -54,7 +54,8 @@ export const DimTreeContent = (props) => {
                 );
                 setLoading(false);
                 //@ts-ignore jsx
-                resData = dealOrgData(Orgs).concat(needUser ? dealUserData(Users) : []);
+                const treeUsers = getUserDepartID(Users);
+                resData = dealOrgData(Orgs).concat(needUser ? dealUserData(treeUsers) : []);
                 setTreeData(resData);
             }
         }
@@ -64,7 +65,7 @@ export const DimTreeContent = (props) => {
         }
     };
     return (React.createElement(React.Fragment, null,
-        React.createElement(SearchBox, { onSearch: search, onClear: () => onReset(), onChange: (val) => !val && onReset() }),
+        React.createElement(SearchBox, { onSearch: search, onClear: () => onReset(), onChange: (val) => !val && onReset(), "data-testid": "SearchBox" }),
         React.createElement("div", { className: "tree-search-loading" }, loading && React.createElement(LoadingTip, null)),
         (errInfo === null || errInfo === void 0 ? void 0 : errInfo.errorStatus) && (React.createElement(ErrorStatus, { size: "l", title: "\u63A5\u53E3\u8C03\u7528\u5931\u8D25", description: (errInfo === null || errInfo === void 0 ? void 0 : errInfo.errorMessage) || null })),
         !(treeData === null || treeData === void 0 ? void 0 : treeData.length) && !loading && !(errInfo === null || errInfo === void 0 ? void 0 : errInfo.errorStatus) && (React.createElement(Status, { className: "dim-tree-select--blank", icon: 'blank', size: 's', title: `暂无${needUser ? '成员' : '部门'}数据` })),

package/dist/web/components/form/userOrgSelect/departTreeSelect/departTreeSelect.h5.js

@@ -117,16 +117,15 @@ export function DepartTreeSelectH5({ id, className, style, events = emptyObject,
     //获取组织结构
     useEffect(() => {
         initOrgsData();
-        if ((defaultValue &&
-            !isObjectEqual(prevDefaultRef.current !== defaultValue)) ||
-            (confirmValue && !isObjectEqual(prevConfirmRef.current !== confirmValue))) {
+        if ((defaultValue && !isObjectEqual(prevDefaultRef.current, defaultValue)) ||
+            (confirmValue && !isObjectEqual(prevConfirmRef.current, confirmValue))) {
             const getdefaultUser = async () => {
                 var _a;
                 try {
                     if ((defaultValueType === 'confirmDepart' &&
                         confirmValue.length !== 0) ||
                         defaultValue.length !== 0) {
-                        const orgId = confirmValue.length !== 0 ? confirmValue : defaultValue;
+                        const orgId = defaultValue.length !== 0 ? defaultValue : confirmValue;
                         const defaultDepart = await getDepartById({
                             _id: orgId,
                         });

package/dist/web/components/form/userOrgSelect/departTreeSelect/departTreeSelect.pc.js

@@ -48,7 +48,7 @@ export function DepartTreeSelectPC({ id, className, style, events = emptyObject,
             try {
                 if ((defaultValueType === 'confirmDepart' && confirmValue.length !== 0) ||
                     defaultValue.length !== 0) {
-                    const orgId = confirmValue.length !== 0 ? confirmValue : defaultValue;
+                    const orgId = defaultValue.length !== 0 ? defaultValue : confirmValue;
                     const defaultUser = await getDepartById({
                         _id: orgId,
                     });
@@ -61,15 +61,14 @@ export function DepartTreeSelectPC({ id, className, style, events = emptyObject,
             }
         };
         initOrgsData();
-        if ((defaultValue &&
-            !isObjectEqual(prevDefaultRef.current !== defaultValue)) ||
-            (confirmValue && !isObjectEqual(prevConfirmRef.current !== confirmValue))) {
+        if ((defaultValue && !isObjectEqual(prevDefaultRef.current, defaultValue)) ||
+            (confirmValue && !isObjectEqual(prevConfirmRef.current, confirmValue))) {
             getdefaultUser();
             prevDefaultRef.current = defaultValue;
             prevConfirmRef.current = confirmValue;
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [defaultValueType, confirmValue, defaultValue, request]);
+    }, [defaultValueType, confirmValue, defaultValue]);
     useEffect(() => {
         if (open) {
             setErrorInfo({ errorStatus: false, errorMessage: null });
@@ -86,7 +85,7 @@ export function DepartTreeSelectPC({ id, className, style, events = emptyObject,
         setErrorInfo({ errorStatus: false, errorMessage: null });
         setActiveIds([]);
         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 });
+        (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value, data: null });
         close && setOpen(false);
     };
     // 外层组件类
@@ -104,7 +103,7 @@ export function DepartTreeSelectPC({ id, className, style, events = emptyObject,
             React.createElement(Dropdown, { className: classNames(`department-tree-select`, `size-${size}`), destroyOnClose: false, open: open, onOpenChange: (open) => {
                     setOpen(open);
                     setErrorInfo({ errorStatus: false, errorMessage: null });
-                }, button: React.createElement(SelectViewContainer, { curSelectItem: curSelectItem, multiple: multiple, placeholder: placeholder, moveIn: moveIn, onChange: () => reset(true) }), style: { width: '100%' }, appearance: multiple ? 'pure' : 'button', clickClose: false, disabled: disabled }, () => (React.createElement("div", { className: "dim-tree-select" },
+                }, button: React.createElement(SelectViewContainer, { curSelectItem: curSelectItem, multiple: multiple, placeholder: placeholder, moveIn: moveIn, onChange: () => reset(true) }), style: { width: '100%' }, appearance: multiple ? 'pure' : 'button', clickClose: false, disabled: disabled }, () => (React.createElement("div", { className: "dim-tree-select dim-tree-select--user" },
                 React.createElement(DimTreeContent, { data: treeData, setTreeData: setTreeData, selectedIds: selectIds, activeIds: activeIds, needUser: false, request: request, errorInfo: errorInfo, searchType: "SearchByOrg", onActive: (ids) => {
                         setActiveIds(ids);
                         setSelectIds(ids);

package/dist/web/components/form/userOrgSelect/getUserService.js

@@ -39,7 +39,8 @@ export const defaultRequest = async (action, params, type = 'callWedaApi') => {
                                 : userInfo[datasource === null || datasource === void 0 ? void 0 : datasource.schema['x-primary-column']] ||
                                     (item === null || item === void 0 ? void 0 : item.UserId),
                         },
-                        orgs: item === null || item === void 0 ? void 0 : item.Orgs,
+                        //优先展示主岗部门,对象格式
+                        orgs: (item === null || item === void 0 ? void 0 : item.MainOrg) ? [].concat(item === null || item === void 0 ? void 0 : item.MainOrg) : (item === null || item === void 0 ? void 0 : item.Orgs) || [],
                     };
                 });
                 userInfoList.push.apply(userInfoList, resData);