@cloudbase/weda-ui 3.2.1 → 3.3.1

package/dist/src/web/components/form/userOrgSelect/userTreeSelect.pc.js

@@ -1,10 +1,10 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useCallback } from 'react';
 import { renderDecorator } from '../renderDecorator';
 import { isInIde, filterStrList } from '../../../utils/platform';
 import classNames from 'classnames';
 import { Dropdown, ConfigProvider, Text, Modal } from 'tea-component';
-import { getNode, getRelationData, dealOrgData } from './utils';
-import { getUserInfo, defaultRequest } from '../../../utils/getUserService';
+import { getNode, getRelationData, dealOrgData, dealUserData, removeMarkString, } from './utils';
+import { getUserInfo, defaultRequest } from './getUserService';
 import './userOrgSelect.css';
 import { DimTreeContent } from './comTool';
 import isObjectEqual from '../../../utils/isObjectEqual';
@@ -14,11 +14,10 @@ export function UserTreeSelectPC({ id, className, modelClassName, modelStyle, //
 style, events = emptyObject, 
 // 组件属性
 label = '人员选择', labelVisible = true, //标题显隐
-// name = 'formUserTreeSelect',
 defaultValue = emptyArray, //默认值，支持数组
 confirmValue = '', placeholder = '请选择人员', defaultValueType = 'noneUser', disabled = false, layout = 'horizontal', modelType = 'dropdown', requiredFlag = false, size = 'l', multiple = false, //多选
 onChange = null, request = defaultRequest, //接口请求
-decorator, matchButtonWidth = false, dropDownStyle = defaultDropDownStyle, }) {
+decorator, matchButtonWidth = false, modelOpen = false, dropDownStyle = defaultDropDownStyle, }) {
     // 两次默认值不同, 需要刷新
     const prevDefaultRef = React.useRef(null);
     const prevConfirmRef = React.useRef(null);
@@ -33,50 +32,11 @@ decorator, matchButtonWidth = false, dropDownStyle = defaultDropDownStyle, }) {
     //鼠标移入移除输入框
     const [moveIn, setMoveIn] = useState(false);
     const [originalOrgData, setOriginalOrgData] = useState([]);
-    const [, setErrorInfo] = useState({
+    const [errorInfo, setErrorInfo] = useState({
         errorStatus: false,
         errorMessage: null,
     });
-    useEffect(() => {
-        initOrgsData();
-    }, [defaultValueType]);
-    useEffect(() => {
-        if ((defaultValue &&
-            !isObjectEqual(prevDefaultRef.current !== defaultValue)) ||
-            (confirmValue &&
-                !isObjectEqual(prevConfirmRef.current !== confirmValue)) ||
-            defaultValueType === 'loginUser') {
-            getdefaultUser();
-            prevDefaultRef.current = defaultValue;
-            prevConfirmRef.current = confirmValue;
-        }
-    }, [defaultValueType, confirmValue, defaultValue]);
-    useEffect(() => {
-        var _a;
-        if (open) {
-            setErrorInfo({ errorStatus: false, errorMessage: null });
-            const userId = (_a = curSelectData[0]) === null || _a === void 0 ? void 0 : _a.userId;
-            const isOrgs = getNode(orgsTreeData, userId, 'userId');
-            if (isOrgs) {
-                setActiveIds([isOrgs.id]);
-                setSelectIds([isOrgs.id]);
-            }
-        }
-    }, [open]);
-    // 初始化数据
-    const initOrgsData = async () => {
-        try {
-            setErrorInfo({ errorStatus: false, errorMessage: null });
-            const resData = (await request('InitRootOrgs', {})) || [];
-            const data = dealOrgData(resData);
-            setOrgsTreeData(data);
-            setOriginalOrgData([...data]);
-        }
-        catch (e) {
-            setErrorInfo({ errorStatus: true, errorMessage: e });
-        }
-    };
-    const getdefaultUser = async () => {
+    const getDefaultUser = useCallback(async (defaultValue) => {
         var _a;
         try {
             setErrorInfo({ errorStatus: false, errorMessage: null });
@@ -104,16 +64,76 @@ decorator, matchButtonWidth = false, dropDownStyle = defaultDropDownStyle, }) {
             else if ((defaultValueType === 'confirmUser' && confirmValue.length !== 0) ||
                 defaultValue.length !== 0) {
                 const userIdList = filterStrList(confirmValue.length !== 0 ? confirmValue : defaultValue);
-                const userSelectList = await request('getUserById', {
+                const userList = await request('getUserById', {
                     idList: userIdList || [],
                 }, 'callDataSource');
+                const userSelectList = [];
+                userList.forEach((list) => {
+                    var _a;
+                    if (Array.isArray(list === null || list === void 0 ? void 0 : list.orgs)) {
+                        userSelectList.push({
+                            value: `${(_a = list === null || list === void 0 ? void 0 : list.orgs[0]) === null || _a === void 0 ? void 0 : _a.OrgId}-${list.value}`,
+                            data: list === null || list === void 0 ? void 0 : list.data,
+                        });
+                    }
+                    else {
+                        userSelectList.push(list);
+                    }
+                });
                 setCurSelectData([...userSelectList]);
             }
         }
         catch (e) {
             setErrorInfo({ errorStatus: true, errorMessage: e });
         }
-    };
+    }, [confirmValue, defaultValueType, events, request]);
+    useEffect(() => {
+        // 初始化数据
+        const initOrgsData = async () => {
+            try {
+                setErrorInfo({ errorStatus: false, errorMessage: null });
+                const resData = (await request('InitRootOrgs', {})) || [];
+                const pageNo = 1;
+                const noOrgUserData = await request('DescribeWedaUsersRuntime', {
+                    pageNo: pageNo,
+                    pageSize: 200,
+                    IsNoRelatedOrgFlag: true,
+                    UserType: 'internalUser',
+                });
+                const data = dealOrgData(resData).concat(dealUserData(noOrgUserData === null || noOrgUserData === void 0 ? void 0 : noOrgUserData.UserList));
+                setOrgsTreeData(data);
+                setOriginalOrgData([...data]);
+            }
+            catch (e) {
+                setErrorInfo({ errorStatus: true, errorMessage: e });
+            }
+        };
+        initOrgsData();
+    }, [defaultValueType, request]);
+    useEffect(() => {
+        setOpen(modelOpen);
+    }, [modelOpen]);
+    useEffect(() => {
+        if ((defaultValue &&
+            !isObjectEqual(prevDefaultRef.current !== defaultValue)) ||
+            (confirmValue &&
+                !isObjectEqual(prevConfirmRef.current !== confirmValue)) ||
+            defaultValueType === 'loginUser') {
+            getDefaultUser(defaultValue);
+            prevDefaultRef.current = defaultValue;
+            prevConfirmRef.current = confirmValue;
+        }
+    }, [defaultValueType, confirmValue, defaultValue, getDefaultUser]);
+    useEffect(() => {
+        if (open) {
+            setErrorInfo({ errorStatus: false, errorMessage: null });
+            const userIdList = curSelectData.map((d) => d === null || d === void 0 ? void 0 : d.value);
+            if (userIdList && userIdList.length > 0) {
+                setActiveIds(userIdList);
+                setSelectIds(userIdList);
+            }
+        }
+    }, [open, orgsTreeData, curSelectData]);
     const reset = (close, value = '') => {
         var _a;
         setSelectIds([]);
@@ -136,6 +156,43 @@ decorator, matchButtonWidth = false, dropDownStyle = defaultDropDownStyle, }) {
         'dim-tree-select--user': true,
         [className]: modelClassName,
     });
+    const onActiveChange = (ids) => {
+        const selectedId = ids[0];
+        const node = getNode(orgsTreeData, selectedId, 'id');
+        if (node === null || node === void 0 ? void 0 : node.isUser) {
+            //多选情况，取消选中某元素时
+            if (multiple && activeIds.indexOf(selectedId) !== -1) {
+                activeIds.splice(activeIds.indexOf(selectedId), 1);
+                setActiveIds([...activeIds]);
+                setSelectIds([...activeIds]);
+            }
+            else {
+                setActiveIds(multiple ? [...activeIds, ...ids] : [...ids]);
+                setSelectIds(multiple ? [...activeIds, ...ids] : [...ids]);
+            }
+        }
+    };
+    const onConfirm = () => {
+        var _a, _b;
+        const nodeList = [];
+        const idList = [];
+        const selectItem = [];
+        removeMarkString(selectIds).forEach((selectId) => {
+            if (selectId) {
+                const node = getNode(orgsTreeData, selectId, 'userId');
+                nodeList.push(node);
+                idList.push((node === null || node === void 0 ? void 0 : node.userId) || selectId);
+                selectItem.push({
+                    value: node === null || node === void 0 ? void 0 : node.userId,
+                    data: node,
+                });
+            }
+        });
+        getDefaultUser([...idList]);
+        onChange === null || onChange === void 0 ? void 0 : onChange(multiple ? idList : (_a = selectItem[0]) === null || _a === void 0 ? void 0 : _a.value);
+        (_b = events === null || events === void 0 ? void 0 : events.change) === null || _b === void 0 ? void 0 : _b.call(events, multiple ? { value: idList, data: nodeList } : selectItem[0]);
+        setOpen(false);
+    };
     return renderDecorator(React.createElement(ConfigProvider, { classPrefix: "wedatea2td" },
         React.createElement("div", { onMouseEnter: () => {
                 setMoveIn(true);
@@ -145,97 +202,22 @@ decorator, matchButtonWidth = false, dropDownStyle = defaultDropDownStyle, }) {
             React.createElement(Dropdown, { "data-testid": "userSelectDropdown", className: classNames('role-tree-select', `role-tree-select--depart`, `size-${size}`), overlayStyle: modelType === 'model' ? { display: 'none' } : {}, destroyOnClose: false, open: open, onOpenChange: (open) => {
                     setOpen(open);
                     setErrorInfo({ errorStatus: false, errorMessage: null });
-                }, button: curSelectData.length === 0 ? (React.createElement(Text, { className: "placeholder" }, placeholder)) : (React.createElement(SelectViewContainer, { curSelectData: curSelectData, multiple: multiple, placeholder: placeholder, onChange: () => reset(true), moveIn: moveIn })), style: dropDownStyle, appearance: 'button', clickClose: false, disabled: disabled, matchButtonWidth: matchButtonWidth }, (close) => (React.createElement(React.Fragment, null, modelType === 'model' ? (React.createElement(Modal, { visible: open, onClose: close, className: "user_modal" },
+                }, button: curSelectData.length === 0 ? (React.createElement(Text, { className: "placeholder" }, placeholder)) : (React.createElement(SelectViewContainer, { curSelectData: curSelectData, placeholder: placeholder, onChange: () => reset(true), moveIn: moveIn })), style: dropDownStyle, appearance: 'button', clickClose: false, disabled: disabled, matchButtonWidth: matchButtonWidth }, (close) => (React.createElement(React.Fragment, null, modelType === 'model' ? (React.createElement(Modal, { visible: open, onClose: close, className: "user_modal" },
                 React.createElement("div", { className: modelCls, style: modelStyle },
-                    React.createElement(DimTreeContent, { data: orgsTreeData, setTreeData: setOrgsTreeData, selectedIds: selectIds, activeIds: activeIds, needUser: true, request: request, onActive: (ids) => {
-                            const selectedId = ids[0];
-                            const node = getNode(orgsTreeData, selectedId, 'id');
-                            if (node === null || node === void 0 ? void 0 : node.isUser) {
-                                //多选情况，取消选中某元素时
-                                if (multiple &&
-                                    activeIds.indexOf(selectedId) !== -1) {
-                                    activeIds.splice(activeIds.indexOf(selectedId), 1);
-                                    setActiveIds([...activeIds]);
-                                    setSelectIds([...activeIds]);
-                                }
-                                else {
-                                    setActiveIds(multiple ? [...activeIds, ...ids] : [...ids]);
-                                    setSelectIds(multiple ? [...activeIds, ...ids] : [...ids]);
-                                }
-                            }
-                        }, onReset: () => setOrgsTreeData(originalOrgData), onCancel: () => {
+                    React.createElement(DimTreeContent, { data: orgsTreeData, setTreeData: setOrgsTreeData, selectedIds: selectIds, activeIds: activeIds, needUser: true, request: request, errorInfo: errorInfo, onActive: (ids) => onActiveChange(ids), onReset: () => setOrgsTreeData(originalOrgData), onCancel: () => {
                             setOpen(false);
                             setErrorInfo({
                                 errorStatus: false,
                                 errorMessage: null,
                             });
-                        }, onClear: () => reset(false), onConfirm: () => {
-                            var _a, _b;
-                            const nodeList = [];
-                            const idList = [];
-                            const selectItem = [];
-                            selectIds.forEach((selectId) => {
-                                if (selectId) {
-                                    const node = getNode(orgsTreeData, selectId, 'id');
-                                    nodeList.push(node);
-                                    idList.push(node.userId);
-                                    selectItem.push({
-                                        value: node === null || node === void 0 ? void 0 : node.userId,
-                                        data: node,
-                                    });
-                                }
-                            });
-                            setCurSelectData(selectItem);
-                            onChange === null || onChange === void 0 ? void 0 : onChange(multiple ? idList : (_a = selectItem[0]) === null || _a === void 0 ? void 0 : _a.value);
-                            setOpen(false);
-                            (_b = events === null || events === void 0 ? void 0 : events.change) === null || _b === void 0 ? void 0 : _b.call(events, multiple
-                                ? { value: idList, data: nodeList }
-                                : selectItem[0]);
-                        } })))) : (React.createElement("div", { className: modelCls, style: modelStyle },
-                React.createElement(DimTreeContent, { data: orgsTreeData, setTreeData: setOrgsTreeData, selectedIds: selectIds, activeIds: activeIds, needUser: true, request: request, onActive: (ids) => {
-                        const selectedId = ids[0];
-                        const node = getNode(orgsTreeData, selectedId, 'id');
-                        if (node === null || node === void 0 ? void 0 : node.isUser) {
-                            //多选情况，取消选中某元素时
-                            if (multiple && activeIds.indexOf(selectedId) !== -1) {
-                                activeIds.splice(activeIds.indexOf(selectedId), 1);
-                                setActiveIds([...activeIds]);
-                                setSelectIds([...activeIds]);
-                            }
-                            else {
-                                setActiveIds(multiple ? [...activeIds, ...ids] : [...ids]);
-                                setSelectIds(multiple ? [...activeIds, ...ids] : [...ids]);
-                            }
-                        }
-                    }, onReset: () => setOrgsTreeData(originalOrgData), onCancel: () => {
+                        }, onClear: () => reset(false), onConfirm: onConfirm })))) : (React.createElement("div", { className: modelCls, style: modelStyle },
+                React.createElement(DimTreeContent, { data: orgsTreeData, setTreeData: setOrgsTreeData, selectedIds: selectIds, activeIds: activeIds, needUser: true, request: request, errorInfo: errorInfo, onActive: (ids) => onActiveChange(ids), onReset: () => setOrgsTreeData(originalOrgData), onCancel: () => {
                         setOpen(false);
                         setErrorInfo({
                             errorStatus: false,
                             errorMessage: null,
                         });
-                    }, onClear: () => reset(false), onConfirm: () => {
-                        var _a, _b;
-                        const nodeList = [];
-                        const idList = [];
-                        const selectItem = [];
-                        selectIds.forEach((selectId) => {
-                            if (selectId) {
-                                const node = getNode(orgsTreeData, selectId, 'id');
-                                nodeList.push(node);
-                                idList.push(node.userId);
-                                selectItem.push({
-                                    value: node === null || node === void 0 ? void 0 : node.userId,
-                                    data: node,
-                                });
-                            }
-                        });
-                        setCurSelectData(selectItem);
-                        onChange === null || onChange === void 0 ? void 0 : onChange(multiple ? idList : (_a = selectItem[0]) === null || _a === void 0 ? void 0 : _a.value);
-                        setOpen(false);
-                        (_b = events === null || events === void 0 ? void 0 : events.change) === null || _b === void 0 ? void 0 : _b.call(events, multiple
-                            ? { value: idList, data: nodeList }
-                            : selectItem[0]);
-                    } })))))))))({
+                    }, onClear: () => reset(false), onConfirm: onConfirm })))))))))({
         id,
         className: cls,
         style,
@@ -264,7 +246,7 @@ const SelectViewContainer = (props) => {
 };
 const ViewCell = ({ data, showType, relation }) => {
     if (showType === 'tree') {
-        return (React.createElement(Text, { verticalAlign: "middle", "data-testid": "defaultValueText" }, data.join(',') || '-'));
+        return (React.createElement(Text, { verticalAlign: "middle", "data-testid": "defaultValueText", className: "dropdown-cell" }, data.join(',') || '-'));
     }
     const defaultValue = getRelationData(relation);
     return (defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.value) ? (React.createElement(Text, { verticalAlign: "middle" }, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.content)) : (React.createElement(Text, null, "-"));

package/dist/src/web/components/form/userOrgSelect/utils.d.ts

@@ -17,8 +17,8 @@ export function dealOrgData(data?: any[]): {
     orgId: any;
     userId: any;
 }[];
-export function dealUserData(data: any[], isRole: any): {
-    id: string;
+export function dealUserData(data: any[], isRole: any, orgId?: string): {
+    id: any;
     expandable: boolean;
     selectable: boolean;
     content: any;
@@ -28,6 +28,7 @@ export function dealUserData(data: any[], isRole: any): {
     children: any;
     icon: () => JSX.Element;
 }[];
+export function removeMarkString(arr?: any[]): any[];
 export function getNode(nodes: any, id: any, key: any): any;
 export function getRelationData(relation: any): {
     content: any;

package/dist/src/web/components/form/userOrgSelect/utils.js

@@ -17,23 +17,31 @@ export const dealOrgData = (data = []) => data.map((i) => ({
     userId: (i === null || i === void 0 ? void 0 : i.UserId) || null,
 }));
 // 处理用户数据格式
-export const dealUserData = (data = [], isRole) => data.map((user) => {
-    var _a;
-    return ({
-        id: `${guidMod(7)}-${user.UserId}`,
-        expandable: false,
-        selectable: true,
-        content: (user === null || user === void 0 ? void 0 : user[user === null || user === void 0 ? void 0 : user.PrimaryColumn]) ||
-            ((user === null || user === void 0 ? void 0 : user.UserExtend)
-                ? ((_a = destr(user.UserExtend)) === null || _a === void 0 ? void 0 : _a[user === null || user === void 0 ? void 0 : user.PrimaryColumn]) || user.UserId
-                : user.UserId),
-        userId: user.UserId,
-        isUser: true,
-        orgId: (user === null || user === void 0 ? void 0 : user.OrgId) || null,
-        children: undefined,
-        icon: isRole ? roleIcon : departIcon,
+export const dealUserData = (data = [], isRole, orgId = '') => {
+    return data.map((user) => {
+        var _a, _b, _c, _d;
+        return ({
+            id: orgId ? `${orgId}-${user === null || user === void 0 ? void 0 : user.UserId}` : user === null || user === void 0 ? void 0 : user.UserId,
+            expandable: false,
+            selectable: true,
+            content: (user === null || user === void 0 ? void 0 : user[nameParse(user === null || user === void 0 ? void 0 : user.PrimaryColumn)]) ||
+                ((user === null || user === void 0 ? void 0 : user.UserExtend)
+                    ? ((_a = destr(user.UserExtend)) === null || _a === void 0 ? void 0 : _a[nameParse(user === null || user === void 0 ? void 0 : user.PrimaryColumn)]) ||
+                        ((_b = destr(user.UserExtend)) === null || _b === void 0 ? void 0 : _b[nameParse((_c = destr(user === null || user === void 0 ? void 0 : user.UserSchema)) === null || _c === void 0 ? void 0 : _c['x-primary-column'])]) ||
+                        (user === null || user === void 0 ? void 0 : user[nameParse((_d = destr(user === null || user === void 0 ? void 0 : user.UserSchema)) === null || _d === void 0 ? void 0 : _d['x-primary-column'])]) ||
+                        user.UserId
+                    : user.UserId),
+            userId: user === null || user === void 0 ? void 0 : user.UserId,
+            isUser: true,
+            orgId: (user === null || user === void 0 ? void 0 : user.OrgId) || null,
+            children: undefined,
+            icon: isRole ? roleIcon : departIcon,
+        });
     });
-});
+};
+//用户主列字段为name时，特殊处理
+const nameParse = (primaryColumn) => primaryColumn === 'name' ? 'Name' : primaryColumn;
+export const removeMarkString = (arr = []) => (arr || []).map((item) => item.indexOf('-') === -1 ? item : item.split('-')[1]);
 export function guidMod(bit) {
     const str = 'qwertyuiopasdfghjklmnbvcxz1234567890';
     let cont = '';

package/dist/src/web/components/formdetail/index.js

@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, forwardRef, useImperativeHandle, useState, } from 'react';
+import React, { useEffect, forwardRef, useImperativeHandle, useState, useCallback, } from 'react';
 import destr from 'destr';
 import classNames from '../../utils/classnames';
 import { usePlatform, randomStr } from '../../utils/platform';
@@ -60,12 +60,11 @@ export const changeHandle = ({ type, name, data, childFormItem, isPureArray, par
 };
 export default forwardRef(function FormDetail(props, ref) {
     const { className, id, style, children, events, name, value: initDetailValue, isPureArray, parent, } = props;
-    const observeRef = useRef(null); // 当前监听对象
     const [defaultValue, setDetailValue] = useState([]);
     const [contextData, setContextData] = useState([]);
     const [childFormItem, setCildFormItem] = useState([]);
     const platform = usePlatform();
-    const init = (defaultValue) => {
+    const init = useCallback((defaultValue) => {
         var _a;
         const formDetailItemValue = {};
         let childFormItem = defaultValue[0] ? Object.keys(defaultValue[0]) : [];
@@ -99,7 +98,7 @@ export default forwardRef(function FormDetail(props, ref) {
             });
         }
         catch (error) {
-            console.log(error);
+            console.error(error);
         }
         const mock = newContextItem(childFormItem, name, isPureArray);
         const data = (initialValues === null || initialValues === void 0 ? void 0 : initialValues.length) ? initialValues : [mock];
@@ -111,28 +110,32 @@ export default forwardRef(function FormDetail(props, ref) {
         // eslint-disable-next-line rulesdir/no-timer
         setTimeout(() => {
             if (!isObjectEqual(formDetailItemValue, {})) {
-                parent.setValue(formDetailItemValue);
+                if ((parent === null || parent === void 0 ? void 0 : parent.setValue) && typeof (parent === null || parent === void 0 ? void 0 : parent.setValue) === 'function') {
+                    parent === null || parent === void 0 ? void 0 : parent.setValue(formDetailItemValue);
+                }
             }
         }, 0);
-    };
+    }, [events, isPureArray, name, parent]);
     // 初始化context的值
     useEffect(() => {
         if (!isObjectEqual(initDetailValue, defaultValue)) {
             setDetailValue(initDetailValue);
             init(initDetailValue);
         }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [initDetailValue]);
     useEffect(() => {
         init(initDetailValue);
         setDetailValue(initDetailValue);
         // 组件卸载时触发
         return () => {
-            var _a, _b;
-            (_a = observeRef.current) === null || _a === void 0 ? void 0 : _a.disconnect();
-            (_b = events === null || events === void 0 ? void 0 : events.onDataChange) === null || _b === void 0 ? void 0 : _b.call(events, { data: [] });
+            var _a;
+            (_a = events === null || events === void 0 ? void 0 : events.onDataChange) === null || _a === void 0 ? void 0 : _a.call(events, { data: [] });
         };
+        // 只执行一次;
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
-    const onChange = (type, params) => {
+    const onChange = useCallback((type, params) => {
         var _a;
         let data = destr(contextData);
         data = changeHandle({
@@ -145,7 +148,7 @@ export default forwardRef(function FormDetail(props, ref) {
         });
         setContextData(data);
         (_a = events === null || events === void 0 ? void 0 : events.onDataChange) === null || _a === void 0 ? void 0 : _a.call(events, { data });
-    };
+    }, [childFormItem, contextData, events, isPureArray, name]);
     useImperativeHandle(ref, () => {
         return {
             methods: {

package/dist/src/web/components/graphicCard/index.js

@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo } from 'react';
+import React, { useMemo } from 'react';
 import './index.css';
 import classNames from '../../utils/classnames';
 import { Row, Col, ConfigProvider, Button, Text } from 'tea-component';
@@ -12,7 +12,6 @@ const CLASS_PREFIX = 'weda-graphic-card';
 export default function GraphicCard({ navOption = emptyArray, ColMobile, ColPC, iconWidthSize, iconHeightSize, titleVisible, desVisible, buttonVisible, textAlign, className, titleColor, titleFontWeight, titleFontSize, titleLineHeight, titleMaxLines, desColor, desFontWeight, desFontSize, desLineHeight, desMaxLines, buttonText, style, }) {
     const platform = usePlatform();
     const isH5 = platform === 'h5';
-    const [colCount, setColCount] = React.useState(2);
     // 一个栅格的宽度
     const { width } = useWindowSize();
     const singleGrid = useMemo(() => (width - 24 * 2) / 12, [width]);
@@ -24,10 +23,10 @@ export default function GraphicCard({ navOption = emptyArray, ColMobile, ColPC,
         [className]: className,
         [`${CLASS_PREFIX}-mobile`]: isH5,
     });
-    useEffect(() => {
+    const colCount = useMemo(() => {
         const col = isH5 ? ColMobile : ColPC;
-        setColCount(col);
-    }, [isH5]);
+        return col !== null && col !== void 0 ? col : 2;
+    }, [ColMobile, ColPC, isH5]);
     const cardList = useMemo(() => {
         const list = [];
         if (prevColRef.current !== colCount ||
@@ -122,7 +121,7 @@ export default function GraphicCard({ navOption = emptyArray, ColMobile, ColPC,
                 ? iconHeightSize
                 : (Number(height) * parseInt(iconHeightSize)) / 100 + 'px';
         return { width, height };
-    }, [iconWidthSize, iconHeightSize, ColMobile, ColPC, isH5]);
+    }, [platform, ColMobile, ColPC, iconWidthSize, iconHeightSize]);
     const tapTo = (colInfo = navOption[0]) => {
         switch (colInfo === null || colInfo === void 0 ? void 0 : colInfo.tapStatus) {
             case 'tap':

package/dist/src/web/components/image/index.js

@@ -46,7 +46,7 @@ src, alt, mode, lazyLoad, imgPreview, maskClosable, fit, }) {
         else {
             return style;
         }
-    }, [style, fit]);
+    }, [objectFit, style]);
     return src === realSrc || (realSrc !== undefined && src !== realSrc) ? (React.createElement(ImageInner, { objectFit: realFit, style: realStyle, className: cls, alt: alt, src: realSrc, isError: isError, setIsError: setIsError, events: events, lazyLoad: lazyLoad, imgPreview: imgPreview, maskClosable: maskClosable })) : null;
 }
 function getObjectFitByWxImageMode(mode) {

package/dist/src/web/components/listView/index.js

@@ -1,3 +1,4 @@
+/* eslint-disable react-hooks/exhaustive-deps */
 import React, { useState, useEffect, useRef, useCallback } from 'react';
 import { callDataSource } from '../../utils/tcb';
 import { isInIde, getWhereList } from '../../utils/platform';

package/dist/src/web/components/lottery/index.js

@@ -1,5 +1,5 @@
 /* eslint-disable react/jsx-key */
-import React, { useState, useEffect, useCallback, useImperativeHandle, } from 'react';
+import React, { useState, useEffect, useCallback, useImperativeHandle, useMemo, } from 'react';
 import { usePlatform } from '../../utils/platform';
 import classNames from '../../utils/classnames';
 import './index.css';
@@ -14,7 +14,7 @@ export default React.forwardRef(function Lottery({ className, id, style, prizeLi
     const [lotteryList, setLotteryList] = useState([]);
     const [btnActived, setBtnActived] = useState(false);
     //获取初始化默认数据，数据不足8条设置默认，超过8条获取前8条
-    const lotteryListDefault = () => {
+    const lotteryListDefault = useMemo(() => {
         const list = [];
         if (prizeList == null) {
             return list;
@@ -39,21 +39,15 @@ export default React.forwardRef(function Lottery({ className, id, style, prizeLi
             }
         }
         return list;
-    };
+    }, [prizeList]);
     const startLottery = useCallback(() => {
-        setLotteryList(lotteryListDefault());
+        setLotteryList(lotteryListDefault);
         setBtnActived(true);
         if (lotteryAction.isStart)
             return;
         events === null || events === void 0 ? void 0 : events.clickLotteryButton();
         setIsStartLottery(true);
-    }, [
-        lotteryAction.isStart,
-        setIsStartLottery,
-        setBtnActived,
-        lotteryListDefault,
-        setLotteryList,
-    ]);
+    }, [lotteryListDefault, events]);
     useImperativeHandle(ref, () => {
         return {
             methods: {
@@ -62,8 +56,8 @@ export default React.forwardRef(function Lottery({ className, id, style, prizeLi
         };
     }, [startLottery]);
     useEffect(() => {
-        setLotteryList(lotteryListDefault());
-    }, [prizeList]);
+        setLotteryList(lotteryListDefault);
+    }, [lotteryListDefault]);
     useEffect(() => {
         lotteryAction.animationCallback = ({ idx, isEnd }) => {
             setActivedId(idx == -1 ? 0 : idx);
@@ -90,7 +84,7 @@ export default React.forwardRef(function Lottery({ className, id, style, prizeLi
                 }, 700);
             }
         };
-    }, [lotteryList]);
+    }, [events, lotteryList]);
     useEffect(() => {
         // 当满足开启抽奖条件并且点击了开奖开关时，启用抽奖
         if (enablePrize && isStartLottery) {
@@ -108,7 +102,7 @@ export default React.forwardRef(function Lottery({ className, id, style, prizeLi
             //立马停止抽奖
             lotteryAction.stop();
         }
-    }, [isStartLottery, enablePrize]);
+    }, [isStartLottery, enablePrize, prizeResult]);
     useEffect(() => {
         // 设置抽奖结果
         lotteryAction.end(prizeResult);
@@ -188,7 +182,7 @@ export default React.forwardRef(function Lottery({ className, id, style, prizeLi
                 setDotHeight(dotHeight);
             }
         }
-    }, [style]);
+    }, [platform, style]);
     const renderDot = (direction, list) => {
         return (React.createElement(React.Fragment, null,
             React.createElement("div", { className: classNames(`${CLASS_PREFIX}__dot`, `${CLASS_PREFIX}__dot-${direction}`) }, list.map((item, index) => {

package/dist/src/web/components/navLayout/index.js

@@ -54,7 +54,7 @@ export default function NavLayout({ navOption = emptyArray, mobileCol, pcCol, ic
     }, [colCount, navOption]);
     React.useEffect(() => {
         setColCount(platform === 'h5' ? mobileCol : pcCol);
-    }, [mobileCol, pcCol]);
+    }, [mobileCol, pcCol, platform]);
     // 每个col的宽度百分比
     const colStyle = {
         width: `${(1 / colCount) * 100}%`,

package/dist/src/web/components/navigationBar/horizontalMenu.js

@@ -48,7 +48,7 @@ const HorizontalMenu = ({ menuData, navigationStyle, selected, setSelected }) =>
         if (platform !== 'h5' && isHorizontal && ((_a = navWrapRef === null || navWrapRef === void 0 ? void 0 : navWrapRef.current) === null || _a === void 0 ? void 0 : _a.children)) {
             getMenuOffset();
         }
-    }, [platform, isHorizontal, navWrapRef]);
+    }, [platform, isHorizontal, navWrapRef, getMenuOffset]);
     // 渲染下拉菜单
     const renderMenuList = (item, navigationStyle) => {
         return (React.createElement(List, { type: "option", className: `${CLASS_PREFIX}__dropdown-menu-list`, style: { background: navigationStyle.menuBackgroundColor } }, item === null || item === void 0 ? void 0 : item.map((menu) => {