@lingxiteam/ebe-utils 0.5.10 → 0.6.1

package/lib/pcpublic/src/components/pcfactory/src/Table/utils/indexedDBHelper.ts

@@ -2,8 +2,7 @@ export interface DataProps {
   userId: string;
   appId: string;
   compId: string;
-  order?: any[];
-  selected?: any[];
+  data?: Record<string, any>
   save: boolean;
 }
 
@@ -12,7 +11,7 @@ const PATTERN = /[^?]+/;
 const DBNAME = 'TABLE_CUSTOM';
 const isIE = !!((window as any).ActiveXObject || 'ActiveXObject' in window);
 
-const getOrSaveData = (actionData: DataProps) => {
+const getOrSaveData = (actionData: DataProps, dataBaseName = DBNAME) => {
   return new Promise((resolve) => {
     const pagePatch = (window.location.hash?.match(PATTERN))?.[0]?.replace(/^#\//, '') || '';
     const pageKey = `${actionData.appId}_${pagePatch}_${actionData.userId}`;
@@ -26,7 +25,7 @@ const getOrSaveData = (actionData: DataProps) => {
         version = parseInt(version.toString().substring(2, 11), 10);
       }
       // 打开数据库，若没有则会创建
-      const request = indexedDB.open(DBNAME, version);
+      const request = indexedDB.open(dataBaseName, version);
       // 数据库打开成功回调
       request.onsuccess = (event: any) => {
         // console.log('打开数据库成功');
@@ -35,7 +34,7 @@ const getOrSaveData = (actionData: DataProps) => {
         const objectStore = transaction.objectStore(pageKey);
         // 保存数据
         if (actionData.save) {
-          const actionPut = objectStore.put({ ORDER: actionData.order, SELECTED: actionData.selected, id: actionData.compId });
+          const actionPut = objectStore.put({ ...(actionData?.data || {}), id: actionData.compId });
           actionPut.onsuccess = (e: any) => {
             // console.log('数组插入成功');
             db.close();
@@ -72,7 +71,7 @@ const getOrSaveData = (actionData: DataProps) => {
       };
     } else {
     // 不支持indexDB,就用localStorage存储
-      const allData: any = JSON.parse(window.localStorage.getItem(DBNAME) || '{}');
+      const allData: any = JSON.parse(window.localStorage.getItem(dataBaseName) || '{}');
       if (actionData.save) {
         // 超过100个就删掉一些
         let allKeys = Object.keys(allData);
@@ -82,11 +81,11 @@ const getOrSaveData = (actionData: DataProps) => {
         allKeys = Object.keys(allData);
         if (allKeys.includes(pageKey)) {
           const data: any = allData[pageKey];
-          data[actionData.compId] = { ORDER: actionData.order, SELECTED: actionData.selected };
+          data[actionData.compId] = { ...(actionData?.data || {}) };
         } else {
-          allData[pageKey] = { [actionData.compId]: { ORDER: actionData.order, SELECTED: actionData.selected } };
+          allData[pageKey] = { [actionData.compId]: { ...(actionData?.data || {}) } };
         }
-        window.localStorage.setItem(DBNAME, JSON.stringify(allData));
+        window.localStorage.setItem(dataBaseName, JSON.stringify(allData));
       } else if (allData?.[pageKey]?.[actionData.compId]) {
         resolve(allData[pageKey][actionData.compId]);
       } else {

package/lib/pcpublic/src/components/pcfactory/src/Table/utils/translate.ts

@@ -8,8 +8,7 @@
     4、第一个找不到，后面都是平级找
  */
 export const translateStaticData = (text: string, staticDataSource: any) => {
-  if (!text) return text;
-  if (!Array.isArray(staticDataSource)) return text;
+  if (text === null || text === undefined || !Array.isArray(staticDataSource)) return text;
 
   const translateContentArr = (Array.isArray(text) ? text : String(text).split(','));
 

package/lib/pcpublic/src/components/pcfactory/src/Tabs/index.tsx

@@ -1,7 +1,7 @@
 import { LingxiForwardRef } from '@lingxiteam/types';
 import { Tabs } from 'antd';
-import type { TabsProps } from 'antd/es/tabs';
 import classnames from 'classnames';
+import type { TabsProps } from 'antd/es/tabs';
 import React, { useEffect, useImperativeHandle, useRef, useState } from 'react';
 import { basicStatusTransfer } from '../utils';
 import ChannelContainer, { ChannelContainerOptions } from '../utils/ChannelContainer';
@@ -14,12 +14,18 @@ export interface MyTabsProps extends TabsProps {
   value: string;
   visible: boolean;
   getEngineApis: any;
+  customExtraHeader?: boolean;
+  extra?: React.ReactNode;
 }
 
 const { TabPane } = Tabs;
 
 const MyTabs = LingxiForwardRef<any, MyTabsProps>((props, ref) => {
-  const { value, visible = true, children, onChange, defaultActiveKey, style, getEngineApis, className, ...restProps } = props;
+  const { value, visible = true, children,
+    onChange,
+    defaultActiveKey, style,
+    getEngineApis, className,
+    customExtraHeader, extra, ...restProps } = props;
 
   const childKeys = useRef<string[]>([]);
 
@@ -27,7 +33,7 @@ const MyTabs = LingxiForwardRef<any, MyTabsProps>((props, ref) => {
 
   const [activeKey, setActiveKey] = useState(() => props.defaultActiveKey);
   const memoActiveKeys = useRef<string[]>([]).current;
-  const hiddenTabsKeyMap = useRef<Record<string, { visible: string; index: number; key: string }>>({}).current; // 隐藏的tabs
+  const hiddenTabsKeyMap = useRef<Record<string, { visible: string, index: number, key: string }>>({}).current; // 隐藏的tabs
   // 缓存下来key 标识当前TabPanel已经渲染
   if (activeKey && !memoActiveKeys.includes(activeKey)) {
     memoActiveKeys.push(activeKey);
@@ -141,6 +147,13 @@ const MyTabs = LingxiForwardRef<any, MyTabsProps>((props, ref) => {
     return null;
   }
 
+  const genExtra = () => {
+    if (customExtraHeader) {
+      return <>{extra || <></>}</>;
+    }
+    return null;
+  };
+
   return (
     <div className={classnames('ued-tabs-wrap', className)}>
       <ChannelContainer>
@@ -157,6 +170,7 @@ const MyTabs = LingxiForwardRef<any, MyTabsProps>((props, ref) => {
               }
               setActiveKey(activeKey);
             }}
+            tabBarExtraContent={genExtra()}
             renderTabBar={(props, DefaultTabBar) => {
               return (
                 <DefaultTabBar {...props}>

package/lib/pcpublic/src/components/pcfactory/src/Tag/index.tsx

@@ -1,8 +1,8 @@
-import { LingxiForwardRef } from '@lingxiteam/types';
+import React from 'react';
 import { Tag } from 'antd';
-import type { TagProps } from 'antd/lib/tag';
 import classnames from 'classnames';
-import React from 'react';
+import type { TagProps } from 'antd/lib/tag';
+import { LingxiForwardRef } from '@lingxiteam/types';
 
 const WrapperTag = ({ children }: Record<string, any>) =>
   React.cloneElement(children, {
@@ -17,6 +17,7 @@ export interface MyTagProps extends TagProps {
 const MyTag = LingxiForwardRef<any, MyTagProps>((props, ref) => {
   const { name, visible = true, title, $$componentItem, ...restProps } = props;
 
+
   return visible ? (
     <WrapperTag>
       <div key={$$componentItem.uid}>

package/lib/pcpublic/src/components/pcfactory/src/Text/index.tsx

@@ -1,6 +1,7 @@
-import { LingxiForwardRef } from '@lingxiteam/types';
 import React, { useMemo } from 'react';
+import { LingxiForwardRef } from '@lingxiteam/types';
 import useDoubleClick from '../utils/hooks/useDoubleClick';
+import classnames from 'classnames';
 
 export interface MyTextProps {
   name?: string;
@@ -22,9 +23,10 @@ export interface MyTextProps {
   pageState?: any;
   pagePublicState?: any;
   onDoubleClick?: React.MouseEventHandler<any>;
-  onClick?: React.MouseEventHandler<any>;
+  onClick?: React.MouseEventHandler<any>
 }
 
+
 const Text = LingxiForwardRef<any, MyTextProps>((props, ref) => {
   const {
     name,
@@ -48,6 +50,7 @@ const Text = LingxiForwardRef<any, MyTextProps>((props, ref) => {
     onDoubleClick,
     onClick,
     getEngineApis,
+    className,
     ...restProps
   } = props;
 
@@ -67,19 +70,26 @@ const Text = LingxiForwardRef<any, MyTextProps>((props, ref) => {
   const engineApis = getEngineApis?.() || {};
 
   const { customs, attrNbrInfo } = textReg || {};
-  const getRegStr = (str: string) => (/^\/.+\/.*/g.test(str) ? str.replace(/^\//, '').replace(/\/$/g, '') : str);
+  const getRegStr = (str: string) =>
+    /^\/.+\/.*/g.test(str) ? str.replace(/^\//, '').replace(/\/$/g, '') : str;
 
-  const getRegMap = (array: string[], originKey: any, targetKey: any): [Record<string, any>, string[]] => {
+  const getRegMap = (
+    array: string[],
+    originKey: any,
+    targetKey: any,
+  ): [Record<string, any>, string[]] => {
     const regExpMap: any = {};
-    const regExpSort = [...array].sort((a: any, b: any) => String(b[originKey]).length - String(a[originKey]).length);
-    regExpSort.forEach(c => {
+    const regExpSort = [...array].sort(
+      (a: any, b: any) => String(b[originKey]).length - String(a[originKey]).length,
+    );
+    regExpSort.forEach((c) => {
       regExpMap[getRegStr(c[originKey])] = c[targetKey];
     });
-    return [regExpMap, regExpSort.map(c => c[originKey])];
+    return [regExpMap, regExpSort.map((c) => c[originKey])];
   };
 
   const getRegMapItem = (map: any, item: string) => {
-    const key = Object.keys(map).find(c => new RegExp(c).test(item)) || '';
+    const key = Object.keys(map).find((c) => new RegExp(c).test(item)) || '';
     return map[key];
   };
 
@@ -88,7 +98,7 @@ const Text = LingxiForwardRef<any, MyTextProps>((props, ref) => {
     const reStr = `(${customRegSort.join('|')})`;
     const newReg = new RegExp(reStr, 'g');
     const pcontent = typeof content === 'string' ? content : '';
-    return pcontent.replace(newReg, it => customRegMap[it] || getRegMapItem(customRegMap, it));
+    return pcontent.replace(newReg, (it) => customRegMap[it] || getRegMapItem(customRegMap, it));
   };
   const Ele: any = useMemo(() => {
     const _tag = textType?.toLowerCase();
@@ -96,27 +106,7 @@ const Text = LingxiForwardRef<any, MyTextProps>((props, ref) => {
       console.warn('文本控件：文本类型不能为空，将使用div进行展示');
       return 'div';
     }
-    const htmlTextTag = [
-      'h1',
-      'h2',
-      'h3',
-      'h4',
-      'h5',
-      'h6',
-      'a',
-      'p',
-      'q',
-      'strong',
-      'em',
-      'mark',
-      'time',
-      'meter',
-      'ruby',
-      'rt',
-      'rp',
-      'div',
-      'span',
-    ];
+    const htmlTextTag = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'a', 'p', 'q', 'strong', 'em', 'mark', 'time', 'meter', 'ruby', 'rt', 'rp', 'div', 'span'];
     if (!htmlTextTag.includes(_tag)) {
       console.warn(`文本控件：文本类型(${_tag})为非文本标签，将使用div进行展示`);
       return 'div';
@@ -128,7 +118,9 @@ const Text = LingxiForwardRef<any, MyTextProps>((props, ref) => {
 
     if (textReg) {
       if (Array.isArray(attrNbrInfo) && attrNbrInfo.length) {
-        finallyContent = attrNbrInfo?.length ? getFinalStr(attrNbrInfo, 'value', 'label') : content;
+        finallyContent = attrNbrInfo?.length
+          ? getFinalStr(attrNbrInfo, 'value', 'label')
+          : content;
       } else if (Array.isArray(customs) && customs.length) {
         finallyContent = getFinalStr(customs, 'text', 'translation');
       }
@@ -140,32 +132,36 @@ const Text = LingxiForwardRef<any, MyTextProps>((props, ref) => {
     return finallyContent;
   }, [content, attrNbrInfo, showHtml]);
 
+  const defaultStyle = {
+    wordBreak: 'break-word',
+    // minHeight: '20px',
+    whiteSpace: 'pre-wrap',
+    // inline-* 会产生一个支柱效应,导致内容为空时依然占据父容器line-height高度。不配置宽度或为auto时使用inline
+    display: style?.width && String(style.width).match(/(%|px)/) ? 'inline-block' : 'inline',
+  };
+
   // eslint-disable-next-line no-nested-ternary
   return visible ? (
     showHtml ? (
       <Ele
         style={{
-          wordBreak: 'break-word',
-          minHeight: '20px',
-          whiteSpace: 'pre-wrap',
-          display: 'inline-block',
+          ...defaultStyle,
           ...style,
         }}
         dangerouslySetInnerHTML={{ __html: showContent }}
         data-compid={(props as any)?.['data-compid']}
+        className={classnames('ued-text', className)}
         {...restProps}
         {...events}
       />
     ) : (
       <Ele
         style={{
-          wordBreak: 'break-word',
-          minHeight: '20px',
-          whiteSpace: 'pre-wrap',
-          display: 'inline-block',
+          ...defaultStyle,
           ...style,
         }}
         data-compid={(props as any)?.['data-compid']}
+        className={classnames('ued-text', className)}
         {...restProps}
         {...events}
       >

package/lib/pcpublic/src/components/pcfactory/src/TextArea/ForIETextArea.tsx

@@ -1,5 +1,5 @@
+import React, { useState, useEffect } from 'react';
 import { debounce } from 'lodash';
-import React, { useEffect, useState } from 'react';
 import { antPrefix } from '../variables';
 
 const isIE = !!((window as any).ActiveXObject || 'ActiveXObject' in window);
@@ -13,12 +13,9 @@ const ForIETextArea = (props: any) => {
   const subRef = React.useRef<any>({ now_value: '' });
   const [compValue, setCompValue] = useState<any>();
 
-  const dSet = React.useCallback(
-    debounce(_value => {
-      setCompValue(_value);
-    }, 100),
-    []
-  );
+  const dSet = React.useCallback(debounce((_value) => {
+    setCompValue(_value);
+  }, 100), []);
 
   useEffect(() => {
     if (value !== undefined) {

package/lib/pcpublic/src/components/pcfactory/src/TextArea/index.tsx

@@ -1,9 +1,9 @@
-import { Input } from 'antd';
 import React, { useEffect, useState } from 'react';
+import { Input } from 'antd';
 import { FormFields, getFieldsProps, useCommonImperativeHandle } from '../utils';
-import { useUpdateEffect } from '../utils/ahooks';
 import { checkNumber } from '../utils/common';
 import ForIETextArea from './ForIETextArea';
+import { useUpdateEffect } from '../utils/ahooks';
 
 export interface TextAreaProps {
   value?: any;
@@ -73,10 +73,13 @@ const WrapperTextArea: React.FC<WrapperTextAreaProps> = ({ children }) =>
 const { TextArea: AntdTextArea } = Input;
 
 const BaseTextArea = (props: BaseTextAreaPropsType) => {
-  const { maxLength, ...restProps } = props;
+  const {
+    maxLength,
+    ...restProps
+  } = props;
 
   // @ts-ignore
-  const WrapText = window.ActiveXObject || 'ActiveXObject' in window ? ForIETextArea : AntdTextArea;
+  const WrapText = (window.ActiveXObject || 'ActiveXObject' in window) ? ForIETextArea : AntdTextArea;
   const [num, setNum] = useState(0);
 
   const handleOnInput = (e: React.FormEvent) => {
@@ -102,13 +105,7 @@ const BaseTextArea = (props: BaseTextAreaPropsType) => {
           textAlign: 'right',
         }}
       >
-        {num > maxLength ? (
-          <>
-            <span style={{ color: '#FF7474' }}>{num}</span> / {maxLength}
-          </>
-        ) : (
-          `${num} / ${maxLength}`
-        )}
+        {num > maxLength ? <><span style={{ color: '#FF7474' }}>{num}</span> / {maxLength}</> : `${num} / ${maxLength}`}
       </span>
     ) : null;
 
@@ -125,7 +122,11 @@ const BaseTextArea = (props: BaseTextAreaPropsType) => {
 
   return (
     <div style={{ position: 'relative' }}>
-      <WrapText {...restProps} onInput={handleOnInput} maxLength={maxLength} />
+      <WrapText
+        {...restProps}
+        onInput={handleOnInput}
+        maxLength={maxLength}
+      />
       {renderNumLimit()}
     </div>
   );
@@ -217,7 +218,11 @@ const TextArea = React.forwardRef<any, TextAreaProps>((props, ref) => {
       rules={finalRules}
       validateTrigger="onBlur"
     >
-      <BaseTextArea maxLength={maxLength} defaultValue={defaultValue} {...restProps} />
+      <BaseTextArea
+        maxLength={maxLength}
+        defaultValue={defaultValue}
+        {...restProps}
+      />
     </FormFields>
   );
 });

package/lib/pcpublic/src/components/pcfactory/src/TooltipView/PropsType.ts

@@ -11,10 +11,12 @@ export interface TooltiProps extends React.HTMLProps<HTMLDivElement> {
   label?: any;
   tipSize?: string;
   tipWidth?: string;
-  tipHeight?: string;
+  tipHeight?:string;
   engineApis?: EngineApisType;
   getEngineApis?: any;
   $$componentItem?: any;
+  // label是否换行
+  labelWrap?: boolean;
 }
 
 export interface UseTooltipProps extends TooltiProps {

package/lib/pcpublic/src/components/pcfactory/src/TooltipView/TooltipViewED/index.tsx

@@ -1,7 +1,7 @@
-import { useToolTipView } from '../hooks';
 import { TooltiProps } from '../PropsType';
+import { useToolTipView } from '../hooks';
 
-const TooltipViewED: React.FC<TooltiProps> = props => {
+const TooltipViewED: React.FC<TooltiProps> = (props) => {
   const ToolTipViewComp = useToolTipView(props);
 
   return ToolTipViewComp;

package/lib/pcpublic/src/components/pcfactory/src/TooltipView/hooks/index.tsx

@@ -1,8 +1,8 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { Tooltip } from 'antd';
+import type { UseTooltipProps } from '../PropsType';
 import CommIconEG from '../../Icon';
 import CommIconED from '../../Icon/IconED';
-import type { UseTooltipProps } from '../PropsType';
 
 const toolTipViewCls = 'ued-tooltip-view';
 const toolTipViewIconCls = `${toolTipViewCls}-icon`;
@@ -22,8 +22,18 @@ const useToolTipView = (props: UseTooltipProps) => {
     tipWidth = '240',
     tipHeight = 'auto',
     engineApis,
+    labelWrap,
   } = props;
   const CommIcon = mode === 'editor' ? CommIconED : CommIconEG;
+
+  // 标题不换行需要增加提示
+  const renderLabelTips = useMemo(() => {
+    if (labelWrap === false) {
+      return <Tooltip title={label} placement="topLeft">{label}</Tooltip>;
+    }
+    return label;
+  }, [label, labelWrap]);
+
   const renderLabel = () => {
     if (titleTip === 'text' && tipIcon) {
       return (
@@ -47,11 +57,11 @@ const useToolTipView = (props: UseTooltipProps) => {
                   $$componentItem={props.$$componentItem}
                 />
               </Tooltip>
-              {label}
+              {renderLabelTips}
             </>
           ) : (
             <>
-              {label}
+              {renderLabelTips}
               <Tooltip
                 title={tipContent}
                 mouseLeaveDelay={0.1}
@@ -74,10 +84,12 @@ const useToolTipView = (props: UseTooltipProps) => {
         </span>
       );
     }
-    return label;
+    return renderLabelTips;
   };
 
   return renderLabel();
 };
 
-export { useToolTipView };
+export {
+  useToolTipView,
+};

package/lib/pcpublic/src/components/pcfactory/src/TooltipView/index.tsx

@@ -1,7 +1,7 @@
-import { useToolTipView } from './hooks';
 import { TooltiProps } from './PropsType';
+import { useToolTipView } from './hooks';
 
-const TooltipView: React.FC<TooltiProps> = props => {
+const TooltipView: React.FC<TooltiProps> = (props) => {
   const ToolTipViewComp = useToolTipView({
     ...props,
     mode: 'engine',

package/lib/pcpublic/src/components/pcfactory/src/Transfer/Transfer.tsx

@@ -80,6 +80,7 @@ export interface MyTransferProps extends FormItemProps {
   formFieldsRef: any;
 
   required: boolean;
+  treeCheckStrictly?: boolean;
 }
 
 const MyTransfer = LingxiForwardRef<any, MyTransferProps>((props, ref) => {
@@ -132,6 +133,7 @@ const MyTransfer = LingxiForwardRef<any, MyTransferProps>((props, ref) => {
     disabled,
     readOnly,
     formFieldsRef,
+    treeCheckStrictly = false,
     ...restProps
   } = props;
 
@@ -152,6 +154,9 @@ const MyTransfer = LingxiForwardRef<any, MyTransferProps>((props, ref) => {
 
   const currentSearchDirection = useRef<'left' | 'right'>('left');
   const searchVal = useRef<string>('');
+  const treeRef = useRef<any>();
+
+  const checkStrictly = useMemo(() => !treeCheckStrictly, [treeCheckStrictly]);
 
   const titles = useMemo(() => {
     return [transferLeftTitle, transferRightTitle];
@@ -418,9 +423,12 @@ const MyTransfer = LingxiForwardRef<any, MyTransferProps>((props, ref) => {
             onItemSelectAll,
             onItemSelect,
           }) => {
+            const isLeftTableCheckUnStrictly = !checkStrictly && isTable && direction === 'left';
+            const checkboxCls = `${prefixCls}-table-td-checkbox`;
             const rowSelection: TableRowSelection<TransferItem> = {
               getCheckboxProps: (item: any) => {
                 return {
+                  className: checkboxCls,
                   disabled:
                     listDisabled ||
                     item.disabled ||
@@ -437,10 +445,20 @@ const MyTransfer = LingxiForwardRef<any, MyTransferProps>((props, ref) => {
                   : difference(listSelectedKeys, treeSelectedKeys);
                 onItemSelectAll(diffKeys as string[], selected);
               },
-              onSelect({ key }, selected) {
+              onSelect({ key }, selected, selectedRows) {
+                if (isLeftTableCheckUnStrictly) {
+                  const treeSelectedKeys = selectedRows
+                    .filter(item => !item?.disabled)
+                    .map(({ key }) => key);
+                  const keys = selected ? difference(treeSelectedKeys.filter(c => !value.includes?.(c)), listSelectedKeys) :
+                    [...listSelectedKeys, ...value].filter(c => !(treeSelectedKeys as string[])?.includes?.(c));
+                  onItemSelectAll(keys, selected);
+                  return;
+                }
                 onItemSelect(key as string, selected);
               },
               selectedRowKeys: direction === 'left' ? [...listSelectedKeys, ...value] : listSelectedKeys,
+              checkStrictly: isTable && direction === 'left' ? checkStrictly : true,
             };
             const tSize = (size === 'large' ? 40 : 32) + 12; // 表格有上内边距
             const searchHeight = isTable ? 44 : 56; // 有搜索框时高度
@@ -513,8 +531,13 @@ const MyTransfer = LingxiForwardRef<any, MyTransferProps>((props, ref) => {
                 childrenColumnName={isTable ? childrenColumnName || 'false' : 'false'}
                 scroll={scroll}
                 onRow={({ key, disabled: itemDisabled }: any) => ({
-                  onClick: () => {
+                  onClick: (e) => {
                     if (itemDisabled || listDisabled || (direction === 'left' && value.includes(key))) return;
+                    if (isLeftTableCheckUnStrictly) {
+                      // 行点击时触发该节点的onCheck事件
+                      e.currentTarget.querySelector(`.${checkboxCls}`)?.click?.();
+                      return;
+                    }
                     onItemSelect(key as string, !listSelectedKeys.includes(key as string));
                   },
                 })}
@@ -538,7 +561,7 @@ const MyTransfer = LingxiForwardRef<any, MyTransferProps>((props, ref) => {
           ...item,
           key: item[uid],
           title: item[labelCode],
-          disabled: value?.includes(item[uid]),
+          disabled: value?.includes(item[uid]) || item.disabled,
           children: generateData(childrenColumnName ? item[childrenColumnName] : item.children),
         };
       });
@@ -557,7 +580,7 @@ const MyTransfer = LingxiForwardRef<any, MyTransferProps>((props, ref) => {
         disabled={disabled}
         dataSource={transferDataSource}
       >
-        {({ direction, onItemSelect, selectedKeys, filteredItems }) => {
+        {({ direction, onItemSelect, onItemSelectAll, selectedKeys, filteredItems }) => {
           if (direction === 'left') {
             const targetKeysData: any = [];
             // eslint-disable-next-line no-inner-declarations
@@ -591,9 +614,10 @@ const MyTransfer = LingxiForwardRef<any, MyTransferProps>((props, ref) => {
             }
             return (
               <Tree
+                ref={treeRef}
                 treeData={[...curTreeData]}
                 checkable
-                checkStrictly
+                checkStrictly={checkStrictly}
                 blockNode
                 defaultExpandAll
                 fieldNames={{
@@ -602,11 +626,22 @@ const MyTransfer = LingxiForwardRef<any, MyTransferProps>((props, ref) => {
                   children: childrenColumnName,
                 }}
                 checkedKeys={checkedKeys}
-                onCheck={(_, { node: { key } }) => {
+                onCheck={(_keys, { node: { key } }) => {
+                  const checked = !isChecked(checkedKeys, key);
+                  if (!checkStrictly) {
+                    const keys = checked ? difference((_keys as string[]).filter((c: any) => !value.includes?.(c)), checkedKeys)
+                      : checkedKeys.filter(c => !(_keys as string[])?.includes?.(c));
+                    onItemSelectAll(keys as string[], checked);
+                    return;
+                  }
                   onItemSelect(key as string, !isChecked(checkedKeys, key));
                 }}
-                onSelect={(_, { node: { key } }) => {
-                  onItemSelect(key as string, !isChecked(checkedKeys, key));
+                onSelect={(_, e) => {
+                  if (treeRef?.current) {
+                    // 选中节点时触发该节点的onCheck事件
+                    const { node } = e;
+                    treeRef.current.onNodeCheck(e, node, !isChecked(checkedKeys, node?.key));
+                  }
                 }}
                 disabled={disabled}
               />

package/lib/pcpublic/src/components/pcfactory/src/Tree/index.tsx

@@ -628,7 +628,14 @@ const MyTree = LingxiForwardRef<any, MyTreeProps>((props, ref) => {
         {icon?.title || iconMap[icon]?.name}
       </span>
     ) : (
-      <span className="ued-tree-icon" onClick={(e) => onClickIcon(e, c, icon)}>
+      <span
+        className="ued-tree-icon"
+        onClick={(e) => {
+          // 非下拉菜单时需要阻止冒泡，否则会同时触发选中树和图标点击事件
+          e.stopPropagation();
+          onClickIcon(e, c, icon);
+        }}
+      >
         <Icon
           key={icon}
           appId={appId}
@@ -820,7 +827,9 @@ const MyTree = LingxiForwardRef<any, MyTreeProps>((props, ref) => {
         }
         return true;
       });
-      if (finalNodeIcons.length <= 3 && !forceDrowdown) {
+      if (finalNodeIcons.length === 0) {
+        iconsDom = null;
+      } else if (finalNodeIcons.length <= 3 && !forceDrowdown) {
         iconsDom = (
           <div key={c.key} className="ued-tree-icons ued-tree-icons-normal">
             {renderIcons(c, finalNodeIcons)}
@@ -1043,6 +1052,7 @@ const MyTree = LingxiForwardRef<any, MyTreeProps>((props, ref) => {
           const tit = title;
           let titText = title;
           const newD = c;
+
           newD.title = tit;
           const originChildrenData = childrenData.get(newD);
 

package/lib/pcpublic/src/components/pcfactory/src/TreeSelect/index.tsx

@@ -487,7 +487,7 @@ const MyTreeSelect = LingxiForwardRef<any, MyTreeSelectProps>((props, ref) => {
       rules={finalRules}
       render={(val) => renderCommonList(val, flattenTreeData(data), {
         labelKey: 'title',
-        valueKey: 'value',
+        valueKey: 'key',
         childrenKey: 'children',
       })}
       ref={formFieldsRef}