@cloudbase/weda-ui 3.4.1 → 3.4.2

package/dist/configs/components/scrollVeiw.json

@@ -2,95 +2,119 @@
     "$schema": "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/schema/lcds_component.json",
     "data": {
         "properties": {
-            "scrollY": {
-                "title": "允许纵向滚动",
+            "showScrollbar": {
+                "title": "滚动条显隐控制",
                 "type": "boolean",
                 "default": true,
+                "x-platforms": ["MP"],
+                "x-category": "基础属性",
+                "x-index": 1,
+                "remarks": "控制滚动条是否显示/隐藏"
+            },
+            "scrollX": {
+                "title": "允许横向滚动",
+                "type": "boolean",
+                "default": false,
                 "x-linkages": [
                     {
                         "type": "value:visible",
-                        "target": "*(scrollTop)",
+                        "target": "*(scrollLeft)",
                         "condition": "{{ $self.value }}"
                     }
                 ],
                 "x-category": "基础属性",
-                "remarks": "开启后，将开启纵向滚动条，组件支持上下滚动"
+                "x-index": 2,
+                "remarks": "开启后，将开启横向滚动条，组件支持左右滚动"
             },
-            "scrollX": {
-                "title": "允许横向滚动",
+            "scrollY": {
+                "title": "允许纵向滚动",
                 "type": "boolean",
-                "default": false,
+                "default": true,
                 "x-linkages": [
                     {
                         "type": "value:visible",
-                        "target": "*(scrollLeft)",
+                        "target": "*(scrollTop)",
                         "condition": "{{ $self.value }}"
                     }
                 ],
                 "x-category": "基础属性",
-                "remarks": "开启后，将开启横向滚动条，组件支持左右滚动"
+                "x-index": 3,
+                "remarks": "开启后，将开启纵向滚动条，组件支持上下滚动"
             },
-            "upperThreshold": {
-                "title": "距顶部/左边多远时，触发scrolltoupper事件",
-                "type": "number",
-                "default": 50,
-                "x-category": "高级属性"
+            "scrollIntoView": {
+                "title": "滚到的元素ID",
+                "type": "string",
+                "x-category": "高级属性",
+                "x-index": 4,
+                "remarks": "将当前的元素滚动到浏览器窗口的可视区域内"
             },
-            "lowerThreshold": {
-                "title": "距底部/右边多远时，触发scrolltolower事件",
+            "scrollLeft": {
+                "title": "横向滚动条位置",
                 "type": "number",
-                "default": 50,
-                "x-category": "高级属性"
+                "x-category": "高级属性",
+                "x-index": 5,
+                "remarks": "输入默认值，横向滚动条将默认移动到该位置"
             },
             "scrollTop": {
                 "title": "竖向滚动条位置",
                 "type": "number",
                 "x-category": "高级属性",
+                "x-index": 6,
                 "remarks": "输入默认值，竖向滚动条将默认移动到该位置"
             },
-            "scrollLeft": {
-                "title": "横向滚动条位置",
+            "lowerThreshold": {
+                "title": "距底部/右边多远时，触发scrolltolower事件",
                 "type": "number",
-                "x-category": "高级属性",
-                "remarks": "输入默认值，横向滚动条将默认移动到该位置"
+                "default": 50,
+                "x-index": 7,
+                "x-category": "高级属性"
             },
-            "scrollIntoView": {
-                "title": "滚到的元素ID",
-                "type": "string",
-                "x-category": "高级属性",
-                "remarks": "将当前的元素滚动到浏览器窗口的可视区域内"
+            "upperThreshold": {
+                "title": "距顶部/左边多远时，触发scrolltoupper事件",
+                "type": "number",
+                "default": 50,
+                "x-index": 8,
+                "x-category": "高级属性"
             },
-            "scrollWithAnimation": {
-                "title": "在设置滚动条位置时使用动画过渡",
+            "enhanced": {
+                "title": "启用 scroll-view 增强特性",
                 "type": "boolean",
                 "default": false,
+                "x-linkages": [
+                    {
+                        "type": "value:visible",
+                        "target": "*(bounces,showScrollbar,pagingEnabled,fastDeceleration)",
+                        "condition": "{{ $self.value }}"
+                    }
+                ],
                 "x-platforms": ["MP"],
                 "x-category": "高级属性",
-                "remarks": "开启滚动条动画"
+                "x-index": 90,
+                "remarks": "开启scroll-view增强特性 "
             },
-            "enableBackToTop": {
-                "title": "iOS点击顶部状态栏、安卓双击标题栏时，滚动条返回顶部，只支持竖向",
+            "bounces": {
+                "title": "iOS 下 scroll-view 边界弹性控制",
                 "type": "boolean",
-                "default": false,
+                "default": true,
                 "x-platforms": ["MP"],
-                "x-category": "高级属性",
-                "remarks": "开启后当执行对应操作后滚动条将自动返回顶部"
+                "x-index": 91,
+                "x-category": "高级属性"
             },
-            "enableFlex": {
-                "title": "启用 flexbox 布局",
+            "pagingEnabled": {
+                "title": "分页滑动效果",
                 "type": "boolean",
                 "default": false,
                 "x-platforms": ["MP"],
-                "x-category": "高级属性",
-                "remarks": "开启flexbox布局"
+                "x-index": 93,
+                "x-category": "高级属性"
             },
-            "scrollAnchoring": {
-                "title": "开启 scroll anchoring 特性",
+            "fastDeceleration": {
+                "title": "滑动减速速率控制",
                 "type": "boolean",
                 "default": false,
                 "x-platforms": ["MP"],
-                "x-category": "高级属性",
-                "remarks": "开启scroll-anchoring特性"
+                "x-index": 94,
+                "x-category": "高级属性"
             },
             "refresherEnabled": {
                 "title": "开启自定义下拉刷新",
@@ -105,12 +129,14 @@
                 ],
                 "x-platforms": ["MP"],
                 "x-category": "高级属性",
+                "x-index": 100,
                 "remarks": "开启后可自定义对下拉刷新进行相关配置"
             },
             "refresherThreshold": {
                 "title": "设置自定义下拉刷新阈值",
                 "type": "number",
                 "default": 50,
+                "x-index": 101,
                 "x-platforms": ["MP"],
                 "x-category": "高级属性"
             },
@@ -134,6 +160,7 @@
                     }
                 ],
                 "x-platforms": ["MP"],
+                "x-index": 102,
                 "x-category": "高级属性"
             },
             "refresherBackground": {
@@ -141,6 +168,7 @@
                 "type": "color",
                 "default": "#fff",
                 "x-platforms": ["MP"],
+                "x-index": 103,
                 "x-category": "高级属性"
             },
             "refresherTriggered": {
@@ -148,51 +176,44 @@
                 "type": "boolean",
                 "default": false,
                 "x-platforms": ["MP"],
+                "x-index": 104,
                 "x-category": "高级属性"
             },
-            "enhanced": {
-                "title": "启用 scroll-view 增强特性",
+            "scrollAnchoring": {
+                "title": "开启 scroll anchoring 特性",
                 "type": "boolean",
                 "default": false,
-                "x-linkages": [
-                    {
-                        "type": "value:visible",
-                        "target": "*(bounces,showScrollbar,pagingEnabled,fastDeceleration)",
-                        "condition": "{{ $self.value }}"
-                    }
-                ],
                 "x-platforms": ["MP"],
                 "x-category": "高级属性",
-                "remarks": "开启scroll-view增强特性 "
-            },
-            "bounces": {
-                "title": "iOS 下 scroll-view 边界弹性控制",
-                "type": "boolean",
-                "default": true,
-                "x-platforms": ["MP"],
-                "x-category": "高级属性"
+                "x-index": 110,
+                "remarks": "开启scroll-anchoring特性"
             },
-            "showScrollbar": {
-                "title": "滚动条显隐控制",
+            "enableFlex": {
+                "title": "启用 flexbox 布局",
                 "type": "boolean",
-                "default": true,
+                "default": false,
                 "x-platforms": ["MP"],
-                "x-category": "基础属性",
-                "remarks": "控制滚动条是否显示/隐藏"
+                "x-category": "高级属性",
+                "x-index": 120,
+                "remarks": "开启flexbox布局"
             },
-            "pagingEnabled": {
-                "title": "分页滑动效果",
+            "enableBackToTop": {
+                "title": "iOS点击顶部状态栏、安卓双击标题栏时，滚动条返回顶部，只支持竖向",
                 "type": "boolean",
                 "default": false,
                 "x-platforms": ["MP"],
-                "x-category": "高级属性"
+                "x-category": "高级属性",
+                "x-index": 130,
+                "remarks": "开启后当执行对应操作后滚动条将自动返回顶部"
             },
-            "fastDeceleration": {
-                "title": "滑动减速速率控制",
+            "scrollWithAnimation": {
+                "title": "在设置滚动条位置时使用动画过渡",
                 "type": "boolean",
                 "default": false,
                 "x-platforms": ["MP"],
-                "x-category": "高级属性"
+                "x-index": 140,
+                "x-category": "高级属性",
+                "remarks": "开启滚动条动画"
             }
         }
     },
@@ -243,7 +264,7 @@
         "description": "当组件元素内容长度大于滚动容器时，滚动容器会出滚动条用来对页面内容进行滑动展示。",
         "category": "布局容器",
         "componentOrder": 80,
-        "icon": "//imgcache.qq.com/qcloud/lowcode/static/ide/left-material-icon/ScrollView.svg"
+        "icon": "../icons/ScrollView.svg"
     },
     "configMeta": {
         "docsUrl": "https://docs.cloudbase.net/lowcode/components/wedaUI/src/docs/compsdocs/grid/ScrollView",

package/dist/configs/components/swiper.json

@@ -89,7 +89,7 @@
         "description": "用于快速在页面搭建轮播图展示效果，并支持轮播图的跳转、播放配置。",
         "category": "布局容器",
         "componentOrder": 80,
-        "icon": "//imgcache.qq.com/qcloud/lowcode/static/ide/left-material-icon/Swiper.svg"
+        "icon": "../icons/Swiper.svg"
     },
     "configMeta": {
         "docsUrl": "https://docs.cloudbase.net/lowcode/components/wedaUI/src/docs/compsdocs/show/Swiper"

package/dist/configs/components/tabs.json

@@ -114,7 +114,7 @@
         "title": "选项卡",
         "description": "用于实现常见的选项卡切换效果。",
         "category": "展示",
-        "icon": "//imgcache.qq.com/qcloud/lowcode/static/ide/left-material-icon/TabsContainer.svg"
+        "icon": "../icons/Tabs.svg"
     },
     "configMeta": {
         "docsUrl": "https://docs.cloudbase.net/lowcode/components/wedaUI/src/docs/compsdocs/show/Tabs"

package/dist/configs/components/text.json

@@ -101,7 +101,7 @@
         "description": "用于展示页面中的文本内容。",
         "category": "文本",
         "componentOrder": 100,
-        "icon": "//imgcache.qq.com/qcloud/lowcode/static/ide/left-material-icon/Text.svg"
+        "icon": "../icons/Text.svg"
     },
     "configMeta": {
         "docsUrl": "https://docs.cloudbase.net/lowcode/components/wedaUI/src/docs/compsdocs/text/Text",

package/dist/configs/components/wedaVideo.json

@@ -82,7 +82,7 @@
         "name": "wedaVideo",
         "title": "视频播放",
         "description": "用于视频播放",
-        "icon": "https://qcloudimg.tencent-cloud.cn/raw/c622c16cc4841ef7e99cfe3c05c76f2f.svg",
+        "icon": "../icons/WedaVideo.svg",
         "category": "多媒体",
         "visible": ["APP"]
     }

package/dist/configs/components/wxOpenApi/phone.json

@@ -102,7 +102,7 @@
     "meta": {
         "title": "获取用户手机号",
         "description": "在小程序运行态对用户的手机号进行获取。",
-        "icon": "//imgcache.qq.com/qcloud/lowcode/static/ide/left-material-icon/Phone.svg",
+        "icon": "../../icons/Phone.svg",
         "category": "微信开放能力",
         "categoryOrder": 100,
         "componentOrder": 2,

package/dist/configs/components/wxOpenApi/phoneCode.json

@@ -87,7 +87,7 @@
     "meta": {
         "title": "获取用户手机号授权令牌",
         "description": "获取用户手机号授权令牌组件",
-        "icon": "//imgcache.qq.com/qcloud/lowcode/static/ide/left-material-icon/Phone.svg",
+        "icon": "../../icons/PhoneCode.svg",
         "category": "微信开放能力",
         "categoryOrder": 100,
         "componentOrder": 2,

package/dist/configs/components/wxOpenApi/share.json

@@ -62,18 +62,19 @@
                 "x-index": 3
             },
             "title": {
-                "title": "{{text('分享标题', help('分享(转发)卡片的标题'))}}",
+                "title": "分享标题",
+                "description": "分享(转发)卡片的标题",
                 "type": "string",
                 "default": "",
                 "x-category": "基础属性",
-                "description": "",
                 "remarks": "分享(转发)卡片的标题",
                 "x-component": "textarea",
                 "x-platforms": ["MP"],
                 "x-index": 4
             },
             "image": {
-                "title": "{{text('分享图片', help('分享(转发)卡片的图片'))}}",
+                "title": "分享图片",
+                "description": "分享(转发)卡片的图片",
                 "type": "string",
                 "x-component": "image",
                 "x-rules": [
@@ -84,14 +85,14 @@
                 ],
                 "default": "",
                 "x-platforms": ["MP"],
-                "description": "",
                 "remarks": "分享(转发)卡片的图片",
                 "x-category": "基础属性",
                 "x-index": 5
             },
             "path": {
                 "type": "string",
-                "title": "{{text('选择页面', help('选择分享(转发)的页面'))}}",
+                "title": "选择页面",
+                "description": "选择分享(转发)的页面",
                 "default": "",
                 "x-index": 6,
                 "addHidden": true,
@@ -107,7 +108,6 @@
                         "condition": "{{$self.value && $self.value.length>0}}"
                     }
                 ],
-                "description": "",
                 "x-component": "page-list",
                 "x-component-props": {
                     "hideAddPlatform": ["MP"]
@@ -133,12 +133,13 @@
             },
             "params": {
                 "type": "array",
-                "title": "{{text('参数', help('如果采用绑定数据的方式，数据格式参考如下：[{key: \"paramKey1\", value: \"paramValue1\"}, {key: \"paramKey2\", value: \"paramValue2\"}]'))}}",
+                "title": "参数",
                 "x-category": "基础属性",
                 "remarks": "分享(转发)的页面的参数，会自动获取到当前选择页面内存在的页面参数并自动根据页面参数进行展开，当用户通过转发的链接进入小程序时，页面便会按照配置的参数进行渲染。如果采用绑定数据的方式，数据格式参考如下：[{key: 'paramKey1', value: 'paramValue1'}, {key: 'paramKey2', value: 'paramValue2'}]",
                 "pageId": "",
                 "default": [],
                 "x-index": 8,
+                "description": "如果采用绑定数据的方式，数据格式参考如下：[{key: \"paramKey1\", value: \"paramValue1\"}, {key: \"paramKey2\", value: \"paramValue2\"}]",
                 "x-component": "page-params"
             }
         }
@@ -147,7 +148,7 @@
     "meta": {
         "title": "小程序分享",
         "description": "支持快捷实现小程序分享功能。",
-        "icon": "//imgcache.qq.com/qcloud/lowcode/static/ide/left-material-icon/Share.svg",
+        "icon": "../../icons/Share.svg",
         "category": "微信开放能力",
         "categoryOrder": 100,
         "componentOrder": 3,

package/dist/configs/components/wxOpenApi/userInfo.json

@@ -141,14 +141,14 @@
         }
     ],
     "meta": {
-        "title": "获取用户信息",
+        "title": "获取用户信息(已废弃)",
         "description": "能够在小程序运行态对用户的微信头像、微信昵称等信息进行获取。",
-        "icon": "//imgcache.qq.com/qcloud/lowcode/static/ide/left-material-icon/UserInfo.svg",
+        "icon": "../../icons/UserInfo.svg",
         "category": "微信开放能力",
         "categoryOrder": 100,
         "componentOrder": 1,
         "platform": ["MP"],
-        "visible": ["APP"],
+        "visible": [],
         "validate": [
             {
                 "rule": "checkIsUsedPreAvartNickComp",

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

@@ -6,7 +6,6 @@ import { callDataSource, callConnector } from '../../../utils/tcb';
 import weui from '../../../utils/weui';
 import './index.css';
 import isObjectEqual from '../../../utils/isObjectEqual';
-import { usePrevious, useThrottledEffect } from '@react-hookz/web';
 const formTypeWithInitValue = ['edit', 'read'];
 /**
  * 表单容器组件
@@ -22,9 +21,10 @@ export default function Form({ className, contentSlot, style, id, layout, formTy
         'gsd-h5-react-form-pc': platform === 'pc',
         [className]: className,
     });
-    const preParamGetItem = usePrevious(paramGetItem);
-    const preDataId = usePrevious(_id);
-    useThrottledEffect(() => {
+    const preParamGetItemRef = React.useRef(null);
+    const preDataIdRef = React.useRef(null);
+    const timeoutRef = React.useRef(null);
+    React.useEffect(() => {
         const getData = async () => {
             var _a, _b;
             try {
@@ -68,11 +68,22 @@ export default function Form({ className, contentSlot, style, id, layout, formTy
         };
         if (dataSourceName && formTypeWithInitValue.includes(formType)) {
             // https://git.woa.com/QBase/lcap/weda-ui/merge_requests/542 对象要小心死循环
-            if ((isDataModel && _id && !isObjectEqual(preDataId, _id, true)) ||
+            if ((isDataModel &&
+                _id &&
+                !isObjectEqual(preDataIdRef.current, _id, true)) ||
                 (!isDataModel &&
                     paramGetItem &&
                     methodGetItem &&
-                    !isObjectEqual(preParamGetItem, paramGetItem))) {
+                    !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
+                timeoutRef.current = setTimeout(getData, 100);
                 getData();
             }
         }
@@ -84,7 +95,7 @@ export default function Form({ className, contentSlot, style, id, layout, formTy
         platform,
         methodGetItem,
         paramGetItem,
-    ], 100);
+    ]);
     // pc 渲染
     const renderPc = () => {
         return (React.createElement(ConfigProvider, { classPrefix: "wedatea2td" },

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

@@ -7,7 +7,6 @@ export const DimTreeContent = (props) => {
     //const commonParams = [callWedaApi, showToast, showError];
     const [loading, setLoading] = useState(false);
     const [errInfo, setErrInfo] = useState(errorInfo);
-    const [selectedTreeIds, setSelectTreeIds] = useState(selectedIds);
     const loadDepartData = async (id) => {
         const node = getNode(treeData, id, 'id');
         if (node.children) {
@@ -57,7 +56,6 @@ export const DimTreeContent = (props) => {
                 //@ts-ignore jsx
                 const treeUsers = getUserDepartID(Users);
                 resData = dealOrgData(Orgs).concat(needUser ? dealUserData(treeUsers) : []);
-                setSelectTreeIds(treeUsers);
                 setTreeData(resData);
             }
         }
@@ -67,13 +65,13 @@ 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 ? '成员' : '部门'}数据` })),
         !!(treeData === null || treeData === void 0 ? void 0 : treeData.length) && !loading && !(errInfo === null || errInfo === void 0 ? void 0 : errInfo.errorStatus) && (React.createElement(React.Fragment, null,
             React.createElement("div", { className: "tree-select-warp" },
-                React.createElement(Tree, { selectable: false, selectStrictly: true, activable: true, activeIds: activeIds, selectedIds: selectedTreeIds, data: treeData, onLoad: loadDepartData, onActive: onActive, onSelect: onSelect, height: 324, fullExpandable: needUser ? true : false, className: `tree-select ${treeClassName}` })),
+                React.createElement(Tree, { selectable: false, selectStrictly: true, activable: true, activeIds: activeIds, selectedIds: selectedIds, data: treeData, onLoad: loadDepartData, onActive: onActive, onSelect: onSelect, height: 324, fullExpandable: needUser ? true : false, className: `tree-select ${treeClassName}` })),
             React.createElement("div", { className: "dim-tree-footer" },
                 React.createElement(Button, { type: "weak", className: "din-btn din-btn--cancle", onClick: onCancel }, "\u53D6\u6D88"),
                 React.createElement(Button, { type: "primary", className: "din-btn din-btn--primary", onClick: onConfirm }, "\u786E\u5B9A"))))));

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

@@ -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]);
+    }, [defaultValueType, confirmValue, defaultValue]);
     useEffect(() => {
         if (open) {
             setErrorInfo({ errorStatus: false, errorMessage: null });

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

@@ -51,7 +51,7 @@ focus: autoFocus = false, onChange = null, modelOpen = false, request = defaultR
         try {
             const sValue = (_a = event === null || event === void 0 ? void 0 : event.target) === null || _a === void 0 ? void 0 : _a.value;
             if (sValue) {
-                setSearchValue(multiple ? [...searchValue, sValue] : [sValue]);
+                setSearchValue([sValue]);
                 const { Users = [] } = await request('SearchByCondition', {
                     KeyWords: sValue.trim(),
                     SearchCondition: {
@@ -103,10 +103,8 @@ focus: autoFocus = false, onChange = null, modelOpen = false, request = defaultR
     }, [modelOpen]);
     useEffect(() => {
         initOrgsData();
-        if ((defaultValue &&
-            !isObjectEqual(prevDefaultRef.current !== defaultValue)) ||
-            (confirmValue &&
-                !isObjectEqual(prevConfirmRef.current !== confirmValue)) ||
+        if ((defaultValue && !isObjectEqual(prevDefaultRef.current, defaultValue)) ||
+            (confirmValue && !isObjectEqual(prevConfirmRef.current, confirmValue)) ||
             defaultValueType === 'loginUser') {
             getDefaultUser();
             prevDefaultRef.current = defaultValue;
@@ -135,7 +133,7 @@ focus: autoFocus = false, onChange = null, modelOpen = false, request = defaultR
             }
             else if ((defaultValueType === 'confirmUser' && confirmValue.length !== 0) ||
                 defaultValue.length !== 0) {
-                const userIdList = filterStrList(confirmValue.length !== 0 ? confirmValue : defaultValue);
+                const userIdList = filterStrList(defaultValue.length !== 0 ? defaultValue : confirmValue);
                 const userSelectList = await request('getUserById', {
                     idList: userIdList || [],
                 }, 'callDataSource');