@cloudbase/weda-ui 3.3.2 → 3.3.4

package/dist/web/components/form/location/common/mapChoose.js

@@ -1,11 +1,10 @@
-/* eslint-disable react-hooks/exhaustive-deps */
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-nocheck
 import * as React from 'react';
 import classNames from '../../../../utils/classnames';
 import debounce from '../../../../utils/debounce';
 import { tmapApiUrl } from '../constants';
-import { getTMap, calculateDistance, base64LocationIcon } from './tmap';
+import { getTMap, calculateDistance, base64LocationIcon, } from '../../../../utils/tmap';
 import './mapChoose.css';
 import { Icon } from 'tea-component';
 const { useEffect, useState, useRef, useMemo } = React;
@@ -32,7 +31,7 @@ export default function MapChoose({ changeLocation, onConfirm, onClose, currentL
     });
     const [exploreList, setExploreList] = useState([]);
     const [searchList, setSearchList] = useState([]);
-    const mapDomName = Date.now();
+    const mapDomName = useRef(new Date().getTime());
     const clientHeight = useMemo(() => document.documentElement.clientHeight, []);
     const [mapBoxHeight, setMapBoxHeight] = useState(clientHeight - 328);
     const [searchLoadingStatus, setSearchLoadingStatus] = useState(false);
@@ -80,7 +79,7 @@ export default function MapChoose({ changeLocation, onConfirm, onClose, currentL
         //定义地图中心点坐标
         const center = new TMap.LatLng(lat, lng);
         //定义map变量，调用 TMap.Map() 构造函数创建地图
-        mapRef.current = new TMap.Map(document.getElementById(`form-map-choose-${mapDomName}`), {
+        mapRef.current = new TMap.Map(document.getElementById(`form-map-choose-${mapDomName.current}`), {
             center,
             zoom: 16, //设置地图缩放级别
         });
@@ -112,12 +111,12 @@ export default function MapChoose({ changeLocation, onConfirm, onClose, currentL
                 },
                 geometries: [
                     {
-                        id: `pointer-origin-${mapDomName}`,
+                        id: `pointer-origin-${mapDomName.current}`,
                         styleId: 'originPointer',
                         position: currentLocationsPosition,
                     },
                     {
-                        id: `pointer-${mapDomName}`,
+                        id: `pointer-${mapDomName.current}`,
                         styleId: 'pointer',
                         position,
                     },
@@ -161,7 +160,7 @@ export default function MapChoose({ changeLocation, onConfirm, onClose, currentL
             centerRef.current = centerPosition;
             markerRef.current.updateGeometries([
                 {
-                    id: `pointer-${mapDomName}`,
+                    id: `pointer-${mapDomName.current}`,
                     styleId: 'pointer',
                     position: mapRef.current.getCenter(),
                 },
@@ -283,7 +282,7 @@ export default function MapChoose({ changeLocation, onConfirm, onClose, currentL
         mapRef.current.setCenter(center);
         markerRef.current.updateGeometries([
             {
-                id: `pointer-${mapDomName}`,
+                id: `pointer-${mapDomName.current}`,
                 styleId: 'pointer',
                 position: center,
             },
@@ -337,7 +336,7 @@ export default function MapChoose({ changeLocation, onConfirm, onClose, currentL
         changeSearchBoxHeight(false);
     };
     const renderMapView = () => {
-        return (React.createElement("div", { id: `form-map-choose-${mapDomName}`, style: { height: '100%', width: '100%', position: 'relative' } },
+        return (React.createElement("div", { id: `form-map-choose-${mapDomName.current}`, style: { height: '100%', width: '100%', position: 'relative' } },
             React.createElement("div", { className: "weda-ui_mapChoose_map_control", onClick: backToOrigin, onTouchEnd: backToOrigin },
                 React.createElement("img", { src: "https://qcloudimg.tencent-cloud.cn/raw/16f372916b73decb45faa912e37f6e6f.svg", className: "weda-ui_mapChoose_map_control_img", alt: "" }))));
     };
@@ -456,7 +455,7 @@ export default function MapChoose({ changeLocation, onConfirm, onClose, currentL
             const nowPosition = new TMap.LatLng(currentLocationsLatlng.lat, currentLocationsLatlng.lng);
             markerRef.current.updateGeometries([
                 {
-                    id: `pointer-${mapDomName}`,
+                    id: `pointer-${mapDomName.current}`,
                     styleId: 'pointer',
                     position: nowPosition,
                 },

package/dist/web/components/form/location/common/mapView.js

@@ -3,7 +3,7 @@
 import * as React from 'react';
 import * as PropTypes from 'prop-types';
 import { tmapApiUrl } from '../constants';
-import { getTMap } from '../common/tmap';
+import { getTMap } from '../../../../utils/tmap';
 const { useEffect, useRef, useState } = React;
 const defaultLatLng = {
     lat: null,
@@ -97,15 +97,12 @@ export default function MapView({ APIKEY = '', drag = true, zoom = true, latlng
             mapRef.current = null;
             setMapStatus(false);
         };
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [APIKEY]);
     useEffect(() => {
         mapRef.current && mapRef.current.setDraggable(drag);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [drag, mapRef.current]);
     useEffect(() => {
         mapRef.current && getTMap() && removeOrAddZoom(mapRef.current, getTMap());
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [zoom, mapRef.current]);
     useEffect(() => {
         const TMap = getTMap();

package/dist/web/components/form/location/common/propsConfig.d.ts

@@ -13,7 +13,7 @@ export namespace propTypes {
     const zoom: PropTypes.Requireable<boolean>;
     const disabled: PropTypes.Requireable<boolean>;
     const requiredFlag: PropTypes.Requireable<boolean>;
-    const decorator: PropTypes.Requireable<NonNullable<PropTypes.ReactNodeLike>>;
+    const decorator: PropTypes.Requireable<PropTypes.ReactNodeLike>;
     const value: PropTypes.Requireable<object>;
     const locationType: PropTypes.Requireable<number>;
     const dataSource: PropTypes.Requireable<object>;

package/dist/web/components/form/location/common/useLocationInfo.d.ts

@@ -1,4 +1,4 @@
-export default function useLocationInfo({ apiKey, locationType, eventsChange, dataSourceStatus, }: {
+export default function useLocationInfo({ apiKey: APIKEY, locationType, eventsChange, dataSourceStatus, }: {
     apiKey: any;
     locationType: any;
     eventsChange: any;

package/dist/web/components/form/location/components/LocationPC/location.PC.js

@@ -66,7 +66,6 @@ export default function LocationPC(props) {
             customLocation.current = value;
             setLocation(loc);
         }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [value]);
     useEffect(() => {
         if (value || !currentLocations.current)
@@ -92,7 +91,6 @@ export default function LocationPC(props) {
             });
         }
         setLocation(location);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [value, locationType]);
     const showToast = (message) => {
         weui.toast(message, {
@@ -158,7 +156,6 @@ export default function LocationPC(props) {
             });
             showToast('请配置地图连接器');
         }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [dataSource]);
     useEffect(() => {
         let loc = {
@@ -190,7 +187,6 @@ export default function LocationPC(props) {
             poiname: loc.poiname,
             detailedAddress: loc.detailedAddress,
         }, true);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [locationType]);
     const getIsShowMap = () => {
         let status = showMap;

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

@@ -38,18 +38,18 @@ label = '标题', labelVisible = true, format = '', enumName = '', name = 'formR
             prevRangeRef.current = option;
             setCheckedItemValue((_a = option.find((item) => item.checked)) === null || _a === void 0 ? void 0 : _a.value);
         }
-    }, [option]);
+    });
     useEffect(() => {
         // 如果绑定字段类型为枚举，且传入自定义选项集的名称则默认使用自定义选项集的内容作为选项
         if (format === 'x-enum' && enumName) {
             fetchData({ OptNameList: [enumName], PageIndex: 1, PageSize: 10 });
         }
-    }, [enumName, format]);
+    }, []);
     useEffect(() => {
         if (format !== 'x-enum') {
             setOption(range);
         }
-    }, [format, range]);
+    }, [range]);
     const fetchData = async (param) => {
         var _a, _b, _c;
         const data = await callWedaApi({

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

@@ -1,4 +1,3 @@
-/* eslint-disable react-hooks/exhaustive-deps */
 import React, { useEffect, useRef, useState } from 'react';
 import Calendar from './calendar';
 import { Portal } from '../../../common/portal';

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

@@ -75,17 +75,9 @@ defaultRegion, defaultMutiRegion, separator, regionType, onChange, }) {
                 defaultMutiRegion,
             };
         }
-    }, [
-        defaultValue,
-        defaultDate,
-        defaultTime,
-        defaultRegion,
-        defaultMutiRegion,
-        regionType,
-        dateMode,
-    ]);
+    });
     //实现初始值触发change事件
-    const defaultMutiRegionChange = React.useCallback(function (treeValue, defaultMutiRegion) {
+    const defaultMutiRegionChange = function (treeValue, defaultMutiRegion) {
         var _a;
         const defaultValue = defaultMutiRegion
             ? defaultMutiRegion.split(',')
@@ -104,7 +96,7 @@ defaultRegion, defaultMutiRegion, separator, regionType, onChange, }) {
             });
             (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value: defaultMutiRegion, result: changeValue });
         }
-    }, [events]);
+    };
     React.useEffect(() => {
         if (mode == 'region' || mode == 'mutiRegion') {
             if (regionData.length < 1) {
@@ -139,13 +131,7 @@ defaultRegion, defaultMutiRegion, separator, regionType, onChange, }) {
                 break;
             }
         }
-    }, [
-        regionType,
-        mode,
-        regionData,
-        defaultMutiRegionChange,
-        defaultMutiRegion,
-    ]);
+    }, [regionType, mode, regionData]);
     const onDateclick = function () {
         const options = {
             className: 'weda-ui weda-picker',

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

@@ -132,14 +132,7 @@ function SelectPc({ where, dataSourceName, viewId, format, primaryField, enumNam
                 defaultMutiRegion,
             };
         }
-    }, [
-        defaultValue,
-        defaultDate,
-        defaultTime,
-        defaultRegion,
-        defaultMutiRegion,
-        dateMode,
-    ]);
+    });
     React.useEffect(() => {
         if (mode == 'region' || mode == 'mutiRegion') {
             if (regionData.length < 1) {

package/dist/web/components/form/select/use-options.js

@@ -98,6 +98,6 @@ export function useOptions(params) {
         if (state.status === 'success') {
             setOptions(state.result);
         }
-    }, [setOptions, state, state.status]);
+    }, [state, state.status]);
     return [options];
 }

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

@@ -5,7 +5,7 @@ import { getCloudInstance } from '../../../utils/tcb';
 import isObjectEqual from '../../../utils/isObjectEqual';
 import { useSyncValue } from '../../../utils/useSyncValue';
 import { randomStr } from '../../../utils/platform';
-import { IMAGE_TYPES } from './uploader.pc';
+import { IMAGE_TYPES, encodeConvert } from './uploader.pc';
 import { useTempUrl } from '../../../utils/use-cloud-id-temp-url';
 const uploadPath = 'weda-uploader';
 /**
@@ -36,7 +36,7 @@ export function ImageUploaderH5({ title, maxUploadCount, maxSize = 10, acceptTyp
             return inputValue;
         }
         return [];
-    }, [inputValue, setInputValue]);
+    }, [inputValue]);
     const finalMaxImgCount = React.useMemo(() => {
         if (single)
             return 1;
@@ -59,7 +59,7 @@ export function ImageUploaderH5({ title, maxUploadCount, maxSize = 10, acceptTyp
             onChange && onChange(fileIdList);
             events.change && events.change({ value: fileIdList });
         }
-    }, [events, fileIdList, onChange, single]);
+    }, [fileIdList]);
     const onProgress = (progressEvent) => {
         let percentCompleted = 0;
         try {
@@ -73,7 +73,7 @@ export function ImageUploaderH5({ title, maxUploadCount, maxSize = 10, acceptTyp
         setUploading(true);
         getCloudInstance().then(async (tcb) => {
             try {
-                const cloudPath = `${uploadPath}/${randomStr()}-${file === null || file === void 0 ? void 0 : file.name}`;
+                const cloudPath = `${uploadPath}/${randomStr()}-${file === null || file === void 0 ? void 0 : file.name.replace(/[%#]/g, '-')}`;
                 const { fileID } = await tcb.uploadFile({
                     cloudPath,
                     filePath: file,
@@ -163,18 +163,19 @@ function SingleImage({ src, deleteBySrc }) {
         'weui-uploader__file': true,
     });
     const { data: realSrc, error } = useTempUrl(src);
+    const encodeSrc = encodeConvert(realSrc);
     const imgStyle = {
-        backgroundImage: `url(${realSrc})`,
+        backgroundImage: `url(${encodeURI(encodeSrc)})`,
     };
     const showGallery = () => {
-        const gallery = weui.gallery(encodeURI(realSrc), {
+        const gallery = weui.gallery(encodeURI(encodeSrc), {
             onDelete: function () {
                 deleteBySrc(src);
                 gallery.hide();
             },
         });
     };
-    return (React.createElement("li", { className: cls, style: imgStyle, onClick: showGallery }, error || status ? (React.createElement("div", { className: "weui-uploader__file-content" }, error ? (React.createElement("i", { role: "img", "aria-label": "\u9519\u8BEF", className: "weui-icon-warn" })) : (React.createElement("i", { className: "weui-loading", style: { width: 30, height: 30 } })))) : (false)));
+    return (React.createElement("li", { className: cls, style: imgStyle, onClick: showGallery, "data-testid": "uploaderh5_imgStyle" }, error || status ? (React.createElement("div", { className: "weui-uploader__file-content" }, error ? (React.createElement("i", { role: "img", "aria-label": "\u9519\u8BEF", className: "weui-icon-warn" })) : (React.createElement("i", { className: "weui-loading", style: { width: 30, height: 30 } })))) : (false)));
 }
 const UploaderLabel = ({ layout, title, currentCount, maxCount, requiredFlag, }) => {
     if (layout === 'horizontal') {

package/dist/web/components/form/uploader/uploader.pc.d.ts

@@ -27,3 +27,4 @@ export interface PropsType extends H5UploaderProps {
     btnTitle?: string;
     uploadPath?: string;
 }
+export declare function encodeConvert(src: any): any;

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

@@ -53,7 +53,7 @@ export function UploaderPCInner(props) {
             initialValue = initialValue[0] ? [initialValue[0]] : [];
         }
         setfileIDList(initialValue);
-    }, [defaultValue, single]);
+    }, [defaultValue]);
     // 值变化事件
     React.useEffect(() => {
         if (!isObjectEqual(fileRef.current, fileIDList)) {
@@ -121,7 +121,7 @@ export function UploaderPCInner(props) {
         setUploading(true);
         getCloudInstance().then(async (tcb) => {
             try {
-                const cloudPath = `${uploadPath}/${randomStr()}-${file === null || file === void 0 ? void 0 : file.name}`;
+                const cloudPath = `${uploadPath}/${randomStr()}-${file === null || file === void 0 ? void 0 : file.name.replace(/[%#]/g, '-')}`;
                 const { fileID } = await tcb.uploadFile({
                     cloudPath,
                     filePath: file,
@@ -190,19 +190,32 @@ export const TcbImage = (props) => {
     const { fileID, isZoom, ...rest } = props;
     const [isError, setIsError] = React.useState(false);
     const { data: src, error: requestError } = useTempUrl(fileID);
+    const encodeSrc = encodeConvert(src);
     if (isError || requestError) {
         return React.createElement(ErrorTip, null);
     }
     if (src) {
-        return isZoom ? (React.createElement(ImagePreview, { key: fileID, className: `${CLASS_PREFIX}__image`, ...rest, src: encodeURI(src), previewSrc: encodeURI(src), 
+        return isZoom ? (React.createElement(ImagePreview, { key: fileID, className: `${CLASS_PREFIX}__image`, ...rest, src: encodeURI(encodeSrc), previewSrc: encodeURI(encodeSrc), 
             /** @ts-expect-error tea imagepreview onError */
             onError: (e) => {
                 setIsError(true);
                 (props === null || props === void 0 ? void 0 : props.onError) && props.onError(e);
-            } })) : (React.createElement("img", { key: fileID, className: `${CLASS_PREFIX}__image`, ...rest, src: encodeURI(src), onError: (e) => {
+            } })) : (React.createElement("img", { "data-testid": "uploaderpc_imgStyle", key: fileID, className: `${CLASS_PREFIX}__image`, ...rest, src: encodeURI(encodeSrc), onError: (e) => {
                 setIsError(true);
                 (props === null || props === void 0 ? void 0 : props.onError) && props.onError(e);
             } }));
     }
     return null;
 };
+//兼容私有化下载链接encodeURIComponent被编码情况
+export function encodeConvert(src) {
+    if (src) {
+        try {
+            return 'https://' + decodeURIComponent(src.split('https://')[1]);
+        }
+        catch (e) {
+            return src;
+        }
+    }
+    return src;
+}

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

@@ -70,7 +70,7 @@ events = emptyObject, defaultValue, uploadPath = 'weda-uploader', single = true,
             (_c = events === null || events === void 0 ? void 0 : events.success) === null || _c === void 0 ? void 0 : _c.call(events, { value: pureFileIDList });
             fileRef.current = fileIDList;
         }
-    }, [events, fileIDList, onChange, single]);
+    }, [fileIDList]);
     // 外层组件类
     const cls = classNames({
         'weda-ui': true,
@@ -218,9 +218,12 @@ const TcbFileUpload = ({ file, disabled }) => {
         const title = (file === null || file === void 0 ? void 0 : file.name) || '';
         const uuid = file === null || file === void 0 ? void 0 : file._uuid;
         return { size, title, uuid };
-    }, [file === null || file === void 0 ? void 0 : file._uuid, file === null || file === void 0 ? void 0 : file.name, file === null || file === void 0 ? void 0 : file.size]);
+    }, [file === null || file === void 0 ? void 0 : file._uuid]);
+    React.useEffect(() => {
+        handleUpload(file);
+    }, [file === null || file === void 0 ? void 0 : file._uuid]);
     // 上传过程
-    const handleUpload = React.useCallback(async (file) => {
+    const handleUpload = async (file) => {
         var _a;
         const tcb = await getCloudInstance();
         try {
@@ -242,12 +245,7 @@ const TcbFileUpload = ({ file, disabled }) => {
             setStatus('UPLOAD_STATUS_ERROR');
             (_a = events === null || events === void 0 ? void 0 : events.error) === null || _a === void 0 ? void 0 : _a.call(events, err);
         }
-    }, 
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [size, uploadPath, uuid]);
-    React.useEffect(() => {
-        handleUpload(file);
-    }, [file, file._uuid, handleUpload]);
+    };
     return (React.createElement("div", { className: `${CLASS_PREFIX}__item`, role: "TcbFileUpload" },
         React.createElement("div", { className: `${CLASS_PREFIX}__item-left` },
             React.createElement(UploadFileStatus, { status: status, percent: percent, size: size, title: title, percentSize: (((file === null || file === void 0 ? void 0 : file.size) / 1024) * percent) / 100 })),

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

@@ -61,7 +61,6 @@ acceptTypes = emptyArray, downloadVisible = true, deleteVisible = true, uploadPa
             (_c = events === null || events === void 0 ? void 0 : events.success) === null || _c === void 0 ? void 0 : _c.call(events, { value: pureFileIDList });
             fileRef.current = fileIDList;
         }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [fileIDList]);
     // 外层组件类
     const cls = classNames({
@@ -210,9 +209,12 @@ const TcbFileUpload = ({ file, disabled }) => {
         const title = (file === null || file === void 0 ? void 0 : file.name) || '';
         const uuid = file === null || file === void 0 ? void 0 : file._uuid;
         return { size, title, uuid };
-    }, [file === null || file === void 0 ? void 0 : file._uuid, file === null || file === void 0 ? void 0 : file.name, file === null || file === void 0 ? void 0 : file.size]);
+    }, [file === null || file === void 0 ? void 0 : file._uuid]);
+    React.useEffect(() => {
+        handleUpload(file);
+    }, [file === null || file === void 0 ? void 0 : file._uuid]);
     // 上传过程
-    const handleUpload = React.useCallback(async (file) => {
+    const handleUpload = async (file) => {
         const tcb = await getCloudInstance();
         try {
             setStatus('0');
@@ -233,12 +235,7 @@ const TcbFileUpload = ({ file, disabled }) => {
             setStatus('3');
             events.error && events.error(e);
         }
-    }, 
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [size, uploadPath, uuid]);
-    React.useEffect(() => {
-        handleUpload(file);
-    }, [file, file._uuid, handleUpload]);
+    };
     return (React.createElement("div", { className: `${CLASS_PREFIX}--item ${CLASS_PREFIX}--item-body` },
         React.createElement("div", { className: `${CLASS_PREFIX}--item-title`, title: title }, cutFileTitle(title)),
         React.createElement("div", { className: `${CLASS_PREFIX}--item-size` }, size),

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

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { emptyObject } from '../../../../utils/constant';
 import { renderDecorator } from '../../renderDecorator';
 import classNames from 'classnames';
-import { Dropdown, ConfigProvider, Text } from 'tea-component';
+import { Dropdown, ConfigProvider, Text, Icon } from 'tea-component';
 import { getNode, getRelationData, dealOrgData } from '../utils';
 import { getDepartById, defaultRequest } from '../getUserService';
 import '../userOrgSelect.css';
@@ -141,12 +141,11 @@ const SelectViewContainer = (props) => {
         return React.createElement(Text, { className: "placeholder" }, placeholder);
     return (React.createElement(React.Fragment, null,
         React.createElement(ViewCell, { data: curSelectItem, showType: "tree", relation: undefined }),
-        moveIn && (React.createElement(React.Fragment, null,
-            React.createElement("div", { className: "weda-select-user-dept__dialog-input-clear", onClick: (e) => {
-                    e.stopPropagation();
-                    onChange === null || onChange === void 0 ? void 0 : onChange();
-                } },
-                React.createElement("p", { className: "weda-select-user-dept__dialog-input-clear-close" }))))));
+        moveIn && (React.createElement("div", { className: "weda-select-user-dept-input-clear", onClick: (e) => {
+                e.stopPropagation();
+                onChange === null || onChange === void 0 ? void 0 : onChange();
+            } },
+            React.createElement(Icon, { className: 'pc-clear', type: "dismiss", size: "s", onMouseDown: onChange })))));
 };
 const ViewCell = ({ data, showType, relation }) => {
     if (showType === 'tree') {

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

@@ -562,6 +562,7 @@
   z-index: 20;
   cursor: pointer;
 }
+
 .weda-select-user-dept__dialog
   .weda-select-user-dept__dialog-input-clear::before,
 .weda-select-user-dept__dialog
@@ -673,14 +674,14 @@
 .weda-select-user-dept__dialog .user_loading {
   top: -0.14286rem;
 }
-
 .weda-select-user-dept__dialog .wedatea2td-form-check .wedatea2td-checkbox,
 .weda-select-user-dept__dialog .wedatea2td-form-check .wedatea2td-radio-wrap {
   height: 1.42857rem;
   margin-right: 0.85714rem;
 }
-.weda-select-user-dept__dialog .wedatea2td-radio,
-input[type='radio'] {
+.weda-select-user-dept__dialog
+  .weda-select-user-dept__list-item-wrap
+  .wedatea2td-radio {
   width: 1.42857rem;
   height: 1.42857rem;
 }
@@ -807,3 +808,16 @@ input[type='radio'] {
 .weda-user-model-select .size-auto-width .wedatea2td-dropdown__value {
   white-space: pre-wrap;
 }
+.weda-select-user-dept-input-clear {
+  position: absolute;
+  right: 0.57143rem;
+  top: 0;
+  cursor: pointer;
+  background-color: white;
+}
+.weda-select-user-dept-input-clear .pc-clear {
+  position: relative;
+  top: 25%;
+  display: inline-block;
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZmlsbD0iIzg4OCIgZD0iTTggMWE3IDcgMCAxIDAgMCAxNEE3IDcgMCAwIDAgOCAxem0zLjUzNiA5LjEyMWwtMS40MTQgMS40MTRMOCA5LjQxNGwtMi4xMjEgMi4xMjEtMS40MTQtMS40MTRMNi41ODYgOCA0LjQ2NCA1Ljg3OWwxLjQxNC0xLjQxNEw4IDYuNTg2bDIuMTIxLTIuMTIxIDEuNDE0IDEuNDE0TDkuNDE0IDhsMi4xMjIgMi4xMjF6Ii8+PC9zdmc+) !important;
+}

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

@@ -2,7 +2,7 @@ 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 { Dropdown, ConfigProvider, Text, Modal, Icon } from 'tea-component';
 import { getNode, getRelationData, dealOrgData, dealUserData, removeMarkString, } from './utils';
 import { getUserInfo, defaultRequest } from './getUserService';
 import './userOrgSelect.css';
@@ -237,12 +237,11 @@ const SelectViewContainer = (props) => {
         return React.createElement(Text, { className: "placeholder1" }, placeholder);
     return (React.createElement(React.Fragment, null,
         React.createElement(ViewCell, { data: data, showType: "tree", relation: undefined }),
-        moveIn && (React.createElement(React.Fragment, null,
-            React.createElement("div", { className: "weda-select-user-dept__dialog-input-clear", onClick: (e) => {
-                    e.stopPropagation();
-                    onChange === null || onChange === void 0 ? void 0 : onChange();
-                } },
-                React.createElement("p", { className: "weda-select-user-dept__dialog-input-clear-close" }))))));
+        moveIn && (React.createElement("div", { className: "weda-select-user-dept-input-clear", onClick: (e) => {
+                e.stopPropagation();
+                onChange === null || onChange === void 0 ? void 0 : onChange();
+            } },
+            React.createElement(Icon, { className: 'pc-clear', type: "dismiss", size: "s", onMouseDown: onChange })))));
 };
 const ViewCell = ({ data, showType, relation }) => {
     if (showType === 'tree') {

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

@@ -1,4 +1,4 @@
-import React, { useEffect, forwardRef, useImperativeHandle, useState, useCallback, } from 'react';
+import React, { useEffect, useRef, forwardRef, useImperativeHandle, useState, } from 'react';
 import destr from 'destr';
 import classNames from '../../utils/classnames';
 import { usePlatform, randomStr } from '../../utils/platform';
@@ -60,11 +60,12 @@ 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 = useCallback((defaultValue) => {
+    const init = (defaultValue) => {
         var _a;
         const formDetailItemValue = {};
         let childFormItem = defaultValue[0] ? Object.keys(defaultValue[0]) : [];
@@ -110,12 +111,10 @@ export default forwardRef(function FormDetail(props, ref) {
         // eslint-disable-next-line rulesdir/no-timer
         setTimeout(() => {
             if (!isObjectEqual(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);
-                }
+                parent.setValue(formDetailItemValue);
             }
         }, 0);
-    }, [events, isPureArray, name, parent]);
+    };
     // 初始化context的值
     useEffect(() => {
         if (!isObjectEqual(initDetailValue, defaultValue)) {
@@ -129,13 +128,12 @@ export default forwardRef(function FormDetail(props, ref) {
         setDetailValue(initDetailValue);
         // 组件卸载时触发
         return () => {
-            var _a;
-            (_a = events === null || events === void 0 ? void 0 : events.onDataChange) === null || _a === void 0 ? void 0 : _a.call(events, { data: [] });
+            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: [] });
         };
-        // 只执行一次;
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
-    const onChange = useCallback((type, params) => {
+    const onChange = (type, params) => {
         var _a;
         let data = destr(contextData);
         data = changeHandle({
@@ -148,7 +146,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/web/components/graphicCard/index.js

@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import React, { useEffect, useMemo } from 'react';
 import './index.css';
 import classNames from '../../utils/classnames';
 import { Row, Col, ConfigProvider, Button, Text } from 'tea-component';
@@ -12,6 +12,7 @@ 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]);
@@ -23,10 +24,10 @@ export default function GraphicCard({ navOption = emptyArray, ColMobile, ColPC,
         [className]: className,
         [`${CLASS_PREFIX}-mobile`]: isH5,
     });
-    const colCount = useMemo(() => {
+    useEffect(() => {
         const col = isH5 ? ColMobile : ColPC;
-        return col !== null && col !== void 0 ? col : 2;
-    }, [ColMobile, ColPC, isH5]);
+        setColCount(col);
+    }, [isH5]);
     const cardList = useMemo(() => {
         const list = [];
         if (prevColRef.current !== colCount ||
@@ -121,7 +122,7 @@ export default function GraphicCard({ navOption = emptyArray, ColMobile, ColPC,
                 ? iconHeightSize
                 : (Number(height) * parseInt(iconHeightSize)) / 100 + 'px';
         return { width, height };
-    }, [platform, ColMobile, ColPC, iconWidthSize, iconHeightSize]);
+    }, [iconWidthSize, iconHeightSize, ColMobile, ColPC, isH5]);
     const tapTo = (colInfo = navOption[0]) => {
         switch (colInfo === null || colInfo === void 0 ? void 0 : colInfo.tapStatus) {
             case 'tap':