@cloudbase/weda-ui 3.4.9-alpha.1024 → 3.4.10

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

@@ -11,7 +11,7 @@ export const UserOrgContext = React.createContext(null);
 export function UserSelectPC({ id, className, style, label = '人员选择', labelVisible = true, //标题显隐
 placeholder = '请选择人员', disabled = false, layout = 'horizontal', requiredFlag = false, size = 'l', multiple = false, //多选
 outerRef, request = defaultRequest, //接口请求
-decorator, onCancel, onConfirm, errInfo, open, setOpen, selectedOrgId, setSelectedOrgId, selectedUserList, setSelectedUserList, confirmUserList, setConfirmUserList, selectedUserIds, setSelectedUserIds, pageNo, setPageNo, pageSize, filterParams, treeData, orgList, error, onConfirmSelectUser, secondDisplay, }) {
+decorator, onCancel, onConfirm, errInfo, open, setOpen, selectedOrgId, setSelectedOrgId, selectedUserList, setSelectedUserList, confirmUserList, setConfirmUserList, selectedUserIds, setSelectedUserIds, pageNo, setPageNo, pageSize, filterParams, treeData, error, onConfirmSelectUser, secondDisplay, naked, containerClass, triggerElement, }) {
     // 外层组件类
     const cls = classNames({
         'weda-ui': true,
@@ -44,18 +44,16 @@ decorator, onCancel, onConfirm, errInfo, open, setOpen, selectedOrgId, setSelect
                 pageNo,
                 setPageNo,
                 pageSize,
-                orgList,
-                treeData,
-            }, children: _jsx(Dropdown, { "data-testid": "userSelectDropdown", className: classNames(selectInputCls, `size-${size}`), disabled: disabled, open: open, onOpenChange: (open) => {
+            }, children: _jsx(Dropdown, { "data-testid": "userSelectDropdown", className: classNames(selectInputCls, `size-${size}`, containerClass), disabled: disabled, open: open, onOpenChange: (open) => {
                     if (open)
                         setSelectedUserList(confirmUserList);
                     setOpen(open);
-                }, appearance: 'button', button: _jsx(InputTags, { tagsList: confirmUserList, placeholder: placeholder, multiple: multiple, errInfo: errInfo, disabled: disabled, onClose: (e, item) => {
+                }, appearance: 'button', button: triggerElement || (_jsx(InputTags, { tagsList: confirmUserList, placeholder: placeholder, multiple: multiple, errInfo: errInfo, disabled: disabled, onClose: (e, item) => {
                         const currentConfirmUserList = confirmUserList.filter((l) => (l === null || l === void 0 ? void 0 : l.id) !== (item === null || item === void 0 ? void 0 : item.id));
                         setConfirmUserList(currentConfirmUserList);
                         onConfirmSelectUser(currentConfirmUserList);
                         e.stopPropagation();
-                    } }), overlayClassName: 'weda-ui-user-selected-overlay-hidden', style: { width: '100%' }, children: _jsx(UserModel, { open: open, setOpen: setOpen, onConfirm: onConfirm, onCancel: onCancel, treeData: treeData || [], treeDataError: error, filterParams: filterParams, secondDisplay: secondDisplay }) }) }) }))({
+                    } })), overlayClassName: 'weda-ui-user-selected-overlay-hidden', style: { width: '100%' }, children: _jsx(UserModel, { open: open, setOpen: setOpen, onConfirm: onConfirm, onCancel: onCancel, treeData: treeData || [], treeDataError: error, filterParams: filterParams, secondDisplay: secondDisplay }) }) }) }), naked ? null : undefined)({
         id,
         className: cls,
         style,

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

@@ -986,11 +986,13 @@
 
 .weda-select-user-dept .weda-select-user-dept__result-list,
 .weda-select-user-dept__dialog .weda-select-user-dept__result-list {
-  flex: 1 1 0px;
+  /* flex: 1 1 0px;
   display: flex;
   align-items: center;
-  /* overflow: hidden; */
+  overflow: hidden; */
   overflow-x: scroll;
+  width: 100%;
+  white-space: nowrap;
 }
 
 .weda-select-user-dept .weda-select-user-dept__result-list .wedatea2td-tag,
@@ -1037,13 +1039,15 @@
 .weda-select-user-dept__dialog
   .weda-select-user-dept__result-list
   .weda-select-user-dept__result-item {
-  position: relative;
   background: #e3e6eb;
   border-radius: 3px;
   padding: 2px 30px 2px 8px;
   font-size: 12px;
   line-height: 20px;
   color: rgba(0, 0, 0, 0.9);
+  position: relative;
+  display: inline-block;
+  margin-left: 6px;
 }
 
 .weda-select-user-dept__dialog

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

@@ -1,13 +1,14 @@
-import React, { useState, useEffect, useCallback } from 'react';
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import React, { useState } from 'react';
 import { renderDecorator } from '../../renderDecorator';
 import { IconFont } from 'tdesign-icons-react';
 import classNames from '../../../../utils/classnames';
-import { defaultRequest } from '../common/fetch-data-service';
-import { dealOrgDataH5 } from '../common/utils';
+import { fetchSearchOrg, getNodeFromTreeByCode } from '../common/utils';
 import { Modal, Button, ConfigProvider, Radio, Status, Bubble, } from 'tea-component';
 import { ModalSearchH5 } from '../component/modal-search-h5';
 import { LoadingStatus, ErrorStatus } from '../component/error-tips';
-export function DepartTreeSelectH5({ id, className, style, label = '部门选择', labelVisible = true, name = 'formDepartTreeSelect', placeholder = '请选择部门', disabled = false, layout = 'horizontal', requiredFlag = false, size = 'l', decorator, request = defaultRequest, multiple = true, focus: autoFocus = false, confirmOrgList, setConfirmOrgList, selectedOrgList, setSelectedOrgList, errorInfo, setErrorInfo, }) {
+import debounce from '../../../../utils/debounce';
+export function DepartTreeSelectH5({ id, className, style, label = '部门选择', labelVisible = true, name = 'formDepartTreeSelect', placeholder = '请选择部门', disabled = false, layout = 'horizontal', requiredFlag = false, size = 'l', decorator, multiple = true, focus: autoFocus = false, confirmOrgList, setConfirmOrgList, selectedOrgList, setSelectedOrgList, errorInfo, setErrorInfo, treeData, }) {
     var _a;
     const cls = classNames({
         'weda-ui': true,
@@ -22,27 +23,12 @@ export function DepartTreeSelectH5({ id, className, style, label = '部门选择
     });
     const [visible, setVisible] = React.useState(false);
     const [isSearch, setIsSearch] = useState(false);
-    const [orgsTreeData, setOrgsTreeData] = useState([]);
-    const [originalOrgData, setOriginalOrgData] = useState([]);
-    const [count, setCount] = useState(1); //计数弹窗显示层级
+    const [showTreeData, setShowTreeData] = useState([]);
+    // currentItem：到达当前页面是从currentItem部门点击来的
+    const [currentItem, setCurrentItem] = useState(null);
     const [searchValue, setSearchValue] = useState('');
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const [loading, setLoading] = useState({ id: null, status: false });
-    const [titleText, setTitleText] = useState('');
-    // 初始化数据
-    const initOrgsData = useCallback(async () => {
-        try {
-            setTitleText('选择部门');
-            const resData = (await request('InitRootOrgs', {})) || [];
-            const data = dealOrgDataH5(resData);
-            //初始化数据时，默认返回第一层组织结构
-            setCount(1);
-            setOrgsTreeData(data);
-            setOriginalOrgData([{ index: 1, treeData: data, title: '选择部门' }]);
-        }
-        catch (e) {
-            setErrorInfo({ errorStatus: true, errorMessage: e });
-        }
-    }, [request]);
     const handleFocus = (value) => {
         setIsSearch(value);
     };
@@ -50,169 +36,93 @@ export function DepartTreeSelectH5({ id, className, style, label = '部门选择
         setErrorInfo({ errorStatus: false, errorMessage: null });
         handleFocus(false);
         setSearchValue('');
-        initOrgsData();
+        setShowTreeData(treeData);
     };
-    const onSearch = async (event) => {
-        var _a;
+    const onSearch = debounce((key) => {
         try {
             setErrorInfo({ errorStatus: false, errorMessage: null });
-            const sValue = (_a = event === null || event === void 0 ? void 0 : event.target) === null || _a === void 0 ? void 0 : _a.value;
-            setSearchValue(sValue);
-            if (sValue) {
-                const { Orgs = [] } = await request('SearchByCondition', {
-                    KeyWords: sValue.trim(),
-                    SearchCondition: {
-                        SearchType: 'SearchByOrg',
-                        NeedUser: false,
-                    },
-                });
-                setOrgsTreeData(dealOrgDataH5(Orgs));
+            if (key && key.length > 0) {
+                const res = fetchSearchOrg({ key, treeData });
+                setShowTreeData(res);
             }
             else {
-                setSearchValue('');
-                initOrgsData();
+                setShowTreeData(treeData);
             }
         }
         catch (e) {
             setErrorInfo({ errorStatus: true, errorMessage: e });
         }
-    };
+    }, 500);
     const onFocus = function () {
         setSearchValue('');
-        initOrgsData();
         setVisible(true);
+        setShowTreeData(treeData);
     };
     const onClose = () => {
         setErrorInfo({ errorStatus: false, errorMessage: null });
         setVisible(false);
-        setOrgsTreeData([]);
-        initOrgsData();
+        setShowTreeData(treeData);
     };
     const onConfirm = (selectedOrgList = []) => {
         setConfirmOrgList(selectedOrgList);
         setErrorInfo({ errorStatus: false, errorMessage: null });
-        setOrgsTreeData([]);
+        setShowTreeData(treeData);
         setVisible(false);
     };
-    //获取组织结构
-    useEffect(() => {
-        initOrgsData();
-    }, []);
-    //点击部门节点，获取子部门节点
-    const loadDepartData = async (node, count) => {
-        try {
-            setLoading({ id: node.orgId, status: true });
-            const { Orgs = [] } = await request('LazyDescribeOrgs', {
-                OrgId: node.orgId,
-                DescribeCondition: {
-                    NeedUser: true,
-                },
-            });
-            // 如果不存在数据
-            if (!(Orgs === null || Orgs === void 0 ? void 0 : Orgs.length)) {
-                orgsTreeData.forEach((item, index, orgsTreeData) => {
-                    if (item.id == node.id) {
-                        orgsTreeData[index].expandable = false;
-                    }
-                });
-                setOrgsTreeData([...orgsTreeData]);
-            }
-            else {
-                const children = dealOrgDataH5(Orgs);
-                setTitleText(node === null || node === void 0 ? void 0 : node.content);
-                setOrgsTreeData(children);
-                originalOrgData.push({
-                    index: count + 1,
-                    treeData: children,
-                    title: node === null || node === void 0 ? void 0 : node.content,
-                });
-                setCount(count + 1);
-                setOriginalOrgData(originalOrgData);
-            }
-            setLoading({ id: null, status: false });
-        }
-        catch (e) {
-            setErrorInfo({ errorStatus: true, errorMessage: e });
-        }
+    // 获取某节点子部门
+    const loadItem = (item) => {
+        setShowTreeData((item === null || item === void 0 ? void 0 : item.children) ? [].concat(item === null || item === void 0 ? void 0 : item.children) : []);
+        setCurrentItem(item);
     };
-    //判断当前页结构为第几层，如首次渲染则添加至orgsTreeData，二次进入刷新index数据
-    const retLevel = (count) => {
-        const storageOriTreeData = [];
-        if (count !== 1) {
-            originalOrgData.map((item) => {
-                if ((item === null || item === void 0 ? void 0 : item.index) < count) {
-                    storageOriTreeData.push(item);
-                    if ((item === null || item === void 0 ? void 0 : item.index) === count - 1) {
-                        setCount(count - 1);
-                        setTitleText(item.title);
-                        setOrgsTreeData((item === null || item === void 0 ? void 0 : item.treeData) || []);
-                    }
-                }
-                else {
-                    return;
-                }
-            });
-            setOriginalOrgData(storageOriTreeData);
+    // 返回targetItem节点所在的层级
+    const returnToLevelOfNode = (targetItem) => {
+        if (!targetItem) {
+            return;
+        }
+        // 已经返回到根节点层级
+        if (!targetItem.parentcode || targetItem.parentcode === '!!ROOT') {
+            setShowTreeData(treeData);
+            setCurrentItem(null);
         }
         else {
-            onClose();
+            // 要返回targetItem所在的层级，需要找到targetItem的父节点parent，再显示parent的子节点即可
+            const parent = getNodeFromTreeByCode(treeData, targetItem.parentcode);
+            setShowTreeData((parent === null || parent === void 0 ? void 0 : parent.children) || []);
+            // 标记当前是从根节点进到这一层
+            setCurrentItem(parent);
         }
     };
-    return renderDecorator(React.createElement(ConfigProvider, { classPrefix: "wedatea2td" },
-        React.createElement("div", { className: subCls },
-            React.createElement("div", { className: "weui-cell__bd weui-flex" },
-                React.createElement("input", { className: "weui-input", placeholder: placeholder, 
-                    //value={value}
-                    value: (confirmOrgList || []).map((e) => e === null || e === void 0 ? void 0 : e.content).join(','), disabled: disabled, name: name, autoFocus: autoFocus, onClick: onFocus, readOnly: true, role: "input" })),
-            React.createElement(Modal, { visible: visible, onClose: onClose, destroyOnClose: true, className: `weda-ui weda-select-user-dept__dialog` },
-                React.createElement(Modal.Body, { className: ((_a = selectedOrgList[0]) === null || _a === void 0 ? void 0 : _a.orgId) ? 'is-selected-value' : '' },
-                    React.createElement("div", { className: "weda-select-user-dept__dialog-header", id: count.toString() },
-                        React.createElement("div", { className: count == 1 ? '' : 'arrow-left', onClick: () => retLevel(count) }),
-                        titleText),
-                    React.createElement(ModalSearchH5, { value: searchValue, onChange: (key) => onSearch(key), onCancel: cancleSearch, isSearch: isSearch, onFocus: () => {
-                            handleFocus(true);
-                        } }),
-                    (errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.errorStatus) ? (React.createElement(ErrorStatus, { description: (errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.errorMessage) || null })) : !(loading === null || loading === void 0 ? void 0 : loading.status) ? (React.createElement(React.Fragment, null, orgsTreeData && orgsTreeData.length > 0 ? (React.createElement("div", { className: classNames('weda-select-user-dept__dialog-list') }, orgsTreeData.map((item) => {
-                        var _a;
-                        return (React.createElement("div", { className: "weda-select-user-dept__list-item", key: item === null || item === void 0 ? void 0 : item.id },
-                            React.createElement("div", { className: "weda-select-user-dept__list-item-wrap" },
-                                React.createElement(Radio.Group, { value: (_a = selectedOrgList.filter((e) => (e === null || e === void 0 ? void 0 : e.orgId) === (item === null || item === void 0 ? void 0 : item.orgId))[0]) === null || _a === void 0 ? void 0 : _a.orgId, onChange: (value) => {
-                                        const ids = selectedOrgList.map((item) => item === null || item === void 0 ? void 0 : item.orgId);
-                                        // 多选情况，取消选中某元素时
-                                        if (ids.indexOf(value) !== -1) {
-                                            setSelectedOrgList(selectedOrgList.filter((e) => e.orgId !== value));
-                                        }
-                                        else {
-                                            selectedOrgList.push(item);
-                                            setSelectedOrgList(multiple ? [...selectedOrgList] : [item]);
-                                        }
-                                    }, layout: "column" },
-                                    React.createElement(Radio, { name: item === null || item === void 0 ? void 0 : item.orgId },
-                                        React.createElement("div", { className: "weda-select-user-dept__item-detail", onClick: () => {
-                                                loadDepartData(item, count);
-                                            } },
-                                            React.createElement("div", { className: "item-name" }, item === null || item === void 0 ? void 0 : item.content),
-                                            (item === null || item === void 0 ? void 0 : item.expandable) &&
-                                                loading.id !== item.orgId && (React.createElement("div", { className: "lcap-icon lcap-icon-chevronright" }))))),
-                                loading.id === item.orgId && (loading === null || loading === void 0 ? void 0 : loading.status) && (React.createElement("div", null,
-                                    React.createElement(IconFont, { name: "loading", className: `weda-grid-navigation__fonticon depart_loading` }))))));
-                    }))) : (React.createElement(Status, { className: "dim-tree-select--blank", icon: 'blank', size: 's', title: `暂无部门数据` })))) : (React.createElement(LoadingStatus, null))),
-                React.createElement(Modal.Footer, null,
-                    React.createElement("div", null,
-                        selectedOrgList.length > 0 && (React.createElement("div", { className: "weda-select-user-dept__select-result" },
-                            React.createElement("div", { className: "weda-select-user-dept__select-label" }, "\u5DF2\u9009\u62E9"),
-                            React.createElement("div", { className: "weda-select-user-dept__result-list" }, selectedOrgList.map((d) => (React.createElement("div", { key: (d === null || d === void 0 ? void 0 : d.orgId) || (d === null || d === void 0 ? void 0 : d.value), className: "weda-select-user-dept__result-item", onClick: () => {
-                                    setSelectedOrgList(selectedOrgList.filter((e) => (e === null || e === void 0 ? void 0 : e.orgId) !== (d === null || d === void 0 ? void 0 : d.orgId)));
-                                } }, d === null || d === void 0 ? void 0 :
-                                d.content,
-                                React.createElement("div", { className: "close" }))))))),
-                        React.createElement("div", { className: "weda-select-user-dept__btn-group" },
-                            React.createElement(Button, { type: "weak", onClick: onClose }, "\u53D6\u6D88"),
-                            React.createElement(Bubble, { content: selectedOrgList.length === 0 && confirmOrgList.length === 0
-                                    ? '请选择部门'
-                                    : null, className: "weda-select-user-dept__bubble" },
-                                React.createElement(Button, { type: "primary", onClick: () => onConfirm(selectedOrgList), disabled: selectedOrgList.length === 0 &&
-                                        confirmOrgList.length === 0 }, "\u786E\u5B9A")))))))))({
+    return renderDecorator(_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsxs("div", { className: subCls, children: [_jsx("div", { className: "weui-cell__bd weui-flex", children: _jsx("input", { className: "weui-input", placeholder: placeholder, 
+                        //value={value}
+                        value: (confirmOrgList || []).map((e) => e === null || e === void 0 ? void 0 : e.content).join(','), disabled: disabled, name: name, autoFocus: autoFocus, onClick: onFocus, readOnly: true, role: "input" }) }), _jsxs(Modal, { disableEscape: true, maskClosable: false, visible: visible, onClose: onClose, destroyOnClose: true, className: `weda-ui weda-select-user-dept__dialog`, children: [_jsxs(Modal.Body, { className: ((_a = selectedOrgList[0]) === null || _a === void 0 ? void 0 : _a.id) ? 'is-selected-value' : '', children: [_jsxs("div", { className: "weda-select-user-dept__dialog-header", children: [_jsx("div", { className: !currentItem ? '' : 'arrow-left', onClick: () => returnToLevelOfNode(currentItem) }), currentItem ? currentItem.content : '选择部门'] }), _jsx(ModalSearchH5, { value: searchValue, onChange: (key) => {
+                                        onSearch(key);
+                                        setSearchValue(key);
+                                    }, onCancel: cancleSearch, isSearch: isSearch, onFocus: () => {
+                                        handleFocus(true);
+                                    } }), (errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.errorStatus) ? (_jsx(ErrorStatus, { description: (errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.errorMessage) || null })) : !(loading === null || loading === void 0 ? void 0 : loading.status) ? (_jsx(_Fragment, { children: showTreeData && showTreeData.length > 0 ? (_jsx("div", { className: classNames('weda-select-user-dept__dialog-list'), children: showTreeData.map((item) => {
+                                            var _a;
+                                            return (_jsx("div", { className: "weda-select-user-dept__list-item", children: _jsxs("div", { className: "weda-select-user-dept__list-item-wrap", children: [_jsx(Radio.Group, { value: (_a = selectedOrgList.filter((e) => (e === null || e === void 0 ? void 0 : e.id) === (item === null || item === void 0 ? void 0 : item.id))[0]) === null || _a === void 0 ? void 0 : _a.id, onChange: (value) => {
+                                                                const ids = selectedOrgList.map((item) => item === null || item === void 0 ? void 0 : item.id);
+                                                                // 多选情况，取消选中某元素时
+                                                                if (ids.indexOf(value) !== -1) {
+                                                                    setSelectedOrgList(selectedOrgList.filter((e) => e.id !== value));
+                                                                }
+                                                                else {
+                                                                    selectedOrgList.push(item);
+                                                                    setSelectedOrgList(multiple ? [...selectedOrgList] : [item]);
+                                                                }
+                                                            }, layout: "column", children: _jsx(_Fragment, { children: (item === null || item === void 0 ? void 0 : item.selectable) ? (_jsx(Radio, { name: item === null || item === void 0 ? void 0 : item.id, children: _jsxs("div", { className: "weda-select-user-dept__item-detail weda-select-user-dept__item-detail-is-org", onClick: () => {
+                                                                            (item === null || item === void 0 ? void 0 : item.children) ? loadItem(item) : false;
+                                                                        }, children: [_jsx("div", { className: "item-name", children: item === null || item === void 0 ? void 0 : item.content }), (item === null || item === void 0 ? void 0 : item.children) &&
+                                                                                loading.id !== item.id && (_jsx("div", { className: "lcap-icon lcap-icon-chevronright" }))] }) })) : (_jsxs("div", { className: "weda-select-user-dept__item-detail weda-select-user-dept__item-detail-is-org", onClick: () => {
+                                                                        (item === null || item === void 0 ? void 0 : item.children) ? loadItem(item) : false;
+                                                                    }, children: [_jsx("div", { className: "item-name", children: item === null || item === void 0 ? void 0 : item.content }), (item === null || item === void 0 ? void 0 : item.children) && loading.id !== item.id && (_jsx("div", { className: "lcap-icon lcap-icon-chevronright" }))] })) }) }), loading.id === item.id && (loading === null || loading === void 0 ? void 0 : loading.status) && (_jsx("div", { children: _jsx(IconFont, { name: "loading", className: `weda-grid-navigation__fonticon depart_loading` }) }))] }) }, item === null || item === void 0 ? void 0 : item.id));
+                                        }) })) : (_jsx(Status, { className: "dim-tree-select--blank", icon: 'blank', size: 's', title: `暂无部门数据` })) })) : (_jsx(LoadingStatus, {}))] }), _jsx(Modal.Footer, { children: _jsxs("div", { children: [selectedOrgList.length > 0 && (_jsxs("div", { className: "weda-select-user-dept__select-result", children: [_jsx("div", { className: "weda-select-user-dept__select-label", children: "\u5DF2\u9009\u62E9" }), _jsx("div", { className: "weda-select-user-dept__result-list", children: selectedOrgList.map((d) => (_jsxs("div", { className: "weda-select-user-dept__result-item", onClick: () => {
+                                                        setSelectedOrgList(selectedOrgList.filter((e) => (e === null || e === void 0 ? void 0 : e.id) !== (d === null || d === void 0 ? void 0 : d.id)));
+                                                    }, children: [d === null || d === void 0 ? void 0 : d.content, _jsx("div", { className: "close" })] }, (d === null || d === void 0 ? void 0 : d.id) || (d === null || d === void 0 ? void 0 : d.value)))) })] })), _jsxs("div", { className: "weda-select-user-dept__btn-group", children: [_jsx(Button, { type: "weak", onClick: onClose, children: "\u53D6\u6D88" }), _jsx(Bubble, { content: selectedOrgList.length === 0 && confirmOrgList.length === 0
+                                                    ? '请选择部门'
+                                                    : null, className: "weda-select-user-dept__bubble", children: _jsx(Button, { type: "primary", onClick: () => onConfirm(selectedOrgList), disabled: selectedOrgList.length === 0 &&
+                                                        confirmOrgList.length === 0, children: "\u786E\u5B9A" }) })] })] }) })] })] }) }))({
         id,
         className: cls,
         style,

package/dist/web/components/form/userOrgSelect/hooks/use-depart-data.js

@@ -1,10 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import destr from 'destr';
 import useSWR from 'swr';
-import { v4 as uuidv4 } from 'uuid';
-import { fetchUserData, DescribeOrgs, fetchAllCorps, fetchAllDepartments, CURRENT_CORP, } from '../common/fetch-data-service';
-import { buildTree } from '../common/utils';
-import { deepClone } from '../../../../utils/tool';
+import { fetchUserData, DescribeOrgs } from '../common/fetch-data-service';
 const Icon = (_jsx("img", { src: "https://qcloudimg.tencent-cloud.cn/raw/794436ec3d598c50f771e346a8fce4e0.svg" }));
 const buildTreeData = (list) => {
     let res = [];
@@ -22,7 +19,7 @@ const buildTreeData = (list) => {
                 selectable: true,
                 // 下面这3个属性是 TreeData 节点自定义属性
                 code: i.departmentCode,
-                parentCode: i.departmentParentCode,
+                parentcode: i.departmentParentCode,
                 depth: i.depth,
                 disableSelect: i.disableSelect,
             };
@@ -49,7 +46,7 @@ const getChildren = (all, item) => {
             selectable: true,
             // 下面这3个属性是 TreeData 节点自定义属性
             code: i.departmentCode,
-            parentCode: i.departmentParentCode,
+            parentcode: i.departmentParentCode,
             depth: i.depth,
             disableSelect: i.disableSelect,
         };
@@ -91,106 +88,3 @@ export const useDepartData = (props) => {
      */
     return { ...treeData, error };
 };
-const noOrgUsersDepartment = ({ parentCode }) => {
-    const id = `isNoOrgList-${uuidv4()}`;
-    return {
-        id,
-        name: 'isNoOrgList',
-        code: id,
-        parentCode,
-        content: '未关联部门用户',
-        icon: Icon,
-    };
-};
-export const useDepartDataNew = (props) => {
-    const { request } = props;
-    const { data: treeData, error } = useSWR('GetCorpsAndDepartments', async () => {
-        let orgList = [];
-        // 拉取关联企业： 需要拉取所有的企业，以及企业下的部门列表
-        const [allCorpList, allDepartmentsList] = await Promise.all([
-            fetchAllCorps(request).catch(() => {
-                return [];
-            }),
-            fetchAllDepartments(request),
-        ]);
-        // 判断是否拉取到了关联企业
-        const associatedCorps = (allCorpList || []).filter((corp) => corp.id !== CURRENT_CORP.id);
-        // 组件中是否显示企业
-        const showCorps = associatedCorps && associatedCorps.length > 0;
-        /**
-         * 拉取到互联企业，组件第一级展示企业列表；否则，将【当前企业】下的部门平铺
-         */
-        if (showCorps) {
-            orgList = [...allCorpList, ...allDepartmentsList];
-            /**
-             * 处理数据的层级关系
-             * 拉取了企业时，将一级部门的父节点指向对应的企业
-             */
-            for (const item of orgList) {
-                if (item.type === 'department' && item.parentCode === '!!ROOT') {
-                    if (item.corpId) {
-                        // 一级部门的父级节点指向对应的企业
-                        item.parentCode = item.corpId;
-                    }
-                    else {
-                        // 一级部门的corpId为空字符串时，表示属于【本企业】
-                        item.parentCode = CURRENT_CORP.id;
-                    }
-                }
-            }
-        }
-        else {
-            orgList = [...allDepartmentsList];
-            /**
-             * 处理数据的层级关系
-             * 只拉取部门时，将一级部门的parentCode置为空：构建树时判断parentCode为空来查找根节点
-             */
-            for (const item of orgList) {
-                if (item.parentCode === '!!ROOT') {
-                    item.parentCode = undefined;
-                }
-            }
-        }
-        const formattedOrgList = orgList
-            .filter((item) => item.name)
-            .map((item) => {
-            const { id, name, code, parentCode, selectable, ...restProps } = item;
-            return {
-                id,
-                content: name,
-                icon: Icon,
-                name,
-                code,
-                parentCode,
-                children: undefined,
-                selectable,
-                disableSelect: false,
-                ...restProps,
-            };
-        });
-        const { treeData } = buildTree(formattedOrgList);
-        // 选人组件：企业下显示【未关联部门用户】这个虚拟部门
-        const finalTreeData = deepClone(treeData);
-        // 显示企业：该部门作为根节点企业的子节点
-        if (showCorps) {
-            for (const corp of finalTreeData) {
-                if (!corp.children) {
-                    corp.children = [];
-                }
-                corp.children.push(noOrgUsersDepartment({ parentCode: corp.id }));
-            }
-        }
-        else {
-            // 不显示企业，该虚拟部门和一级部门平级
-            finalTreeData.push(noOrgUsersDepartment({ parentCode: CURRENT_CORP.id }));
-        }
-        return {
-            orgList: formattedOrgList,
-            orgTreeData: treeData,
-            finalOrgTreeData: finalTreeData,
-        };
-    }, 
-    // 30秒dedupe
-    { dedupingInterval: 30 * 1000 });
-    return { ...treeData, error };
-};

package/dist/web/components/form-input-hooks/index.js

@@ -79,6 +79,7 @@ export function useFormInputTrait(inputParams) {
             .closest((w) => { var _a, _b; return ((_b = (_a = w.getConfig) === null || _a === void 0 ? void 0 : _a.call(w)) === null || _b === void 0 ? void 0 : _b.componentType) === 'form'; })) === null || _a === void 0 ? void 0 : _a.addFormItem) === null || _b === void 0 ? void 0 : _b.call(_a, name, $widget);
         logger.debug('addFormItem', name);
         return () => {
+            logger.debug('removeFormItem', name);
             removeFormItem === null || removeFormItem === void 0 ? void 0 : removeFormItem();
         };
     }, [$widget, name, form]);
@@ -102,6 +103,7 @@ export function useFormInputTrait(inputParams) {
             setHidden() {
                 setVisible(false);
             },
+            initialDisabled: inputParams.disabled,
             setDisable(value) {
                 const originalValue = disabled;
                 setDisabled(value);
@@ -197,9 +199,11 @@ export function useFormInputTrait(inputParams) {
         logger.debug('useImperativeHandle', result);
         return result;
     }, [
+        inputParams.disabled,
         name,
-        syncValue,
         forceUpdate,
+        syncValue,
+        clearValidate,
         setInnerHandle,
         setSyncedValue,
         disabled,
@@ -207,7 +211,6 @@ export function useFormInputTrait(inputParams) {
         required,
         rules,
         requiredMsg,
-        clearValidate,
     ]);
     const { data: fieldPermission, error: fieldPermissionError, isLoading: fieldPermissionLoading, } = useSWR(() => {
         return [form.authValue, name];

package/dist/web/components/index.js

@@ -125,6 +125,7 @@ export const ModelFlowLayout = loadable(() => import('./flow/modules/layout'), {
 export const ModelFlowProcess = loadable(() => import('./flow/process'), {
     fallback,
 });
+export const FlowGraph = loadable(() => import('./flow-graph'), { fallback });
 export { default as Row } from './grid/row';
 export { default as Col } from './grid/col';
 export { default as Grid } from './grid/grid';

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

@@ -16,7 +16,7 @@ export default function Swiper({ children, className, style, autoplay = true, ci
     const [height, setHeight] = useState(0);
     const { change = () => { } } = events;
     useEffect(() => {
-        const callback = (mutationsList, instance) => {
+        const callback = () => {
             const realChildren = Array.from(originChildrenRef.current.children).map((elem) => {
                 const reactFiberProp = Object.keys(elem).find((prop) => {
                     return (prop.startsWith('__reactInternalInstance') ||
@@ -27,7 +27,6 @@ export default function Swiper({ children, className, style, autoplay = true, ci
                 return reactElem;
             });
             setRealChildren(realChildren);
-            instance.disconnect();
         };
         const observer = new MutationObserver(callback);
         observer.observe(originChildrenRef.current, {

package/dist/web/components/table/BaseTable.js

@@ -6,8 +6,8 @@ import { getColumns, isProcessHoldOrLocked, formatDataToXlsx, getSearchAttribute
 import { FilterFieldsPanel } from './FilterFields';
 import { SelectableBlock } from './SelectableBlock';
 import { REL_DICT, CELL_CUSTOM_OPTION } from '../../utils/constant';
-import { ImportFileModalByApi } from './ImportFileModalByApi';
 import { ExportFileModalByApi } from './ExportFileModalByApi';
+import { ImportFileModalByApi } from './ImportFileModalByApi';
 import { InOrOutRecordModeal } from './InOrOutRecordModeal';
 import isObjectEqual from '../../utils/isObjectEqual';
 import { useEnumContext } from '../../utils/hooks/context';

package/dist/web/components/tabs/tabs.pc.js

@@ -9,15 +9,16 @@ import { useSyncValue } from '../../utils/hooks/useSyncValue';
 export default function TabsPc({ tabs = emptyArray, selectedIndex, events, className, style, isMultipleSlot = true, ...restProps }) {
     const [activeIndex, setActiveIndex] = useSyncValue(selectedIndex);
     const _tabs = React.useMemo(() => {
-        return (Array.isArray(tabs) &&
-            tabs.length &&
-            tabs.map((item, index) => {
-                return {
-                    id: index.toString(),
-                    label: item.title,
-                    value: item.value,
-                };
-            }));
+        if (!Array.isArray(tabs) || tabs.length <= 0) {
+            return [];
+        }
+        return tabs.map((item, index) => {
+            return {
+                id: index.toString(),
+                label: item.title,
+                value: item.value,
+            };
+        });
     }, [tabs]);
     const eventsRef = useSyncedRef(events);
     useCustomCompareEffect(() => {