@lingxiteam/ebe-utils 0.0.22 → 0.0.24

package/es/index.js

@@ -31,7 +31,7 @@ var isArray = function isArray(arr) {
   }
 };
 export var clearAppInfo = function clearAppInfo(appInfo) {
-  var includes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ['appId', 'appCode', 'appName', 'applicationIcon'];
+  var includes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ['appId', 'appCode', 'appName', 'applicationIcon', 'updatorId', 'updatedTime'];
   return Object.keys(appInfo || {}).reduce(function (pre, key) {
     if (includes.includes(key)) {
       pre[key] = appInfo[key];

package/lib/h5public/src/components/factory/src/BlockSelect/index.tsx

@@ -100,7 +100,7 @@ const BlockSelect = LingxiForwardRef<any, MyBlockSelectProps>((props, ref) => {
     $$componentItem,
   } = props;
   const {
-    MemoRenderer: { renderer, MemoLoopItem },
+    MemoRenderer: { renderer, MemoLoopItem, getLoopItemExtraProps },
     getAppFileUrlByFileCode,
   } = getEngineApis();
   const col = columnNum || 1;
@@ -509,6 +509,7 @@ const BlockSelect = LingxiForwardRef<any, MyBlockSelectProps>((props, ref) => {
       key: item[valueKey] ?? i,
       itemId: item[valueKey] ?? i,
       compId: props.$$componentItem.uid,
+      ...getLoopItemExtraProps?.(item, i),
     };
 
     if (swipe && swipeAction?.length && status !== '3') {

package/lib/h5public/src/components/factory/src/Card/index.tsx

@@ -80,10 +80,12 @@ const Card = LingxiForwardRef<any, MyCardProps>((props, ref) => {
   const renderChildren = () => {
     return React.Children.toArray(children).map((child: any) => {
       if ($$ISNEW) {
+        const fStyle = { ...finialStyle };
+        delete fStyle.margin;
         return React.cloneElement(child, {
           extendProps: {
             onBodyClick,
-            style: finialStyle,
+            style: { ...fStyle },
             isContainer: child?.props?.schema?.isContainer,
             ...restProps,
           },
@@ -163,6 +165,7 @@ const Card = LingxiForwardRef<any, MyCardProps>((props, ref) => {
       titleLineHeight,
       padding: padding || '12px', // 兼容旧数据
     };
+    delete defaultStyle.margin;
     if (props?.cardType === '2') {
       return { ...defaultStyle, border: 'none' };
     }
@@ -224,6 +227,7 @@ const Card = LingxiForwardRef<any, MyCardProps>((props, ref) => {
     },
     viewRef,
   );
+  delete restStyle.margin;
   return (
     <AntCard
       className={classNames(

package/lib/h5public/src/components/factory/src/Carousel/index.tsx

@@ -57,7 +57,7 @@ const MyCarousel = LingxiForwardRef<any, MyCarouselProps>((props, ref) => {
     ...restProps
   } = props;
   const { MemoRenderer, px2rem, getLocale } = props.getEngineApis();
-  const { MemoLoopItem, renderer } = MemoRenderer;
+  const { MemoLoopItem, renderer, getLoopItemExtraProps } = MemoRenderer;
 
   const swiperRef = useRef<any>(null);
 
@@ -399,6 +399,7 @@ const MyCarousel = LingxiForwardRef<any, MyCarouselProps>((props, ref) => {
                 renderer,
                 itemId: `${i}`,
                 compId: props.$$componentItem.uid,
+                ...getLoopItemExtraProps?.(item, i),
               };
               return (
                 <Swiper.Item

package/lib/h5public/src/components/factory/src/DForm/index.tsx

@@ -408,6 +408,7 @@ const DForm = LingxiForwardRef<any, MyDFormProps>((props, ref) => {
     <DFormContext.Provider
       value={{
         isForm: true,
+        formCode,
         error: errorValues,
         // @ts-ignore
         form,

package/lib/h5public/src/components/factory/src/DformList/FormItem/index.tsx

@@ -118,7 +118,7 @@ const FormList: FC<FormListProps> = (props) => {
     visible,
   } = props;
   const { MemoRenderer, onlySyncValue } = getEngineApis();
-  const { MemoLoopItem, renderer } = MemoRenderer;
+  const { MemoLoopItem, renderer, getLoopItemExtraProps } = MemoRenderer;
   const currentItem = value[fieldProps][index];
 
   const preCurrentItemRef = useRef(currentItem);
@@ -187,6 +187,7 @@ const FormList: FC<FormListProps> = (props) => {
     },
     itemId: newItem[uniqueField] ?? index,
     compId,
+    ...getLoopItemExtraProps?.(newItem, index),
   };
 
   return <MemoLoopItem {...itemProps} />;

package/lib/h5public/src/components/factory/src/DformList/List/index.tsx

@@ -41,7 +41,7 @@ const List: FC<ListProps> = ({
   compId,
 }) => {
   const { MemoRenderer } = getEngineApis();
-  const { MemoLoopItem, renderer } = MemoRenderer;
+  const { MemoLoopItem, renderer, getLoopItemExtraProps } = MemoRenderer;
 
   return (
     <>
@@ -56,6 +56,7 @@ const List: FC<ListProps> = ({
           __render__,
           itemId: item[uniqueField] ?? index,
           compId,
+          ...getLoopItemExtraProps?.(item, index),
         };
         return <MemoLoopItem {...itemProps} />;
       })}

package/lib/h5public/src/components/factory/src/Donut/Dount.tsx

@@ -28,7 +28,7 @@ const MyDonut: LingXiFC<MyDonutProps> = (props, ref) => {
   } = props;
   const { MemoRenderer, sandBoxSafeRun, sandBoxLoadModule } =
     props.getEngineApis();
-  const { MemoLoopItem, renderer } = MemoRenderer;
+  const { MemoLoopItem, renderer, getLoopItemExtraProps } = MemoRenderer;
   const { components } = renderer;
   const funcExpExecute = useFuncExpExecute(sandBoxSafeRun);
   const [probackColor, setprobackColor] = useState('');
@@ -266,6 +266,7 @@ const MyDonut: LingXiFC<MyDonutProps> = (props, ref) => {
             renderer,
             compId: $$componentItem.uid,
             itemId: index,
+            ...getLoopItemExtraProps?.(item, index),
           };
           return (
             <span

package/lib/h5public/src/components/factory/src/DynamicList/index.tsx

@@ -55,7 +55,6 @@ interface DataRefProps {
   refreshing: boolean;
   total: number;
   currentPage: number;
-  pageLoad: boolean;
   resolve?: any;
 }
 
@@ -92,16 +91,16 @@ const DynamicList = LingxiForwardRef<any, MyDynamicListProps>((props, ref) => {
   } = props;
 
   const { MemoRenderer, getLocale, dataState } = getEngineApis?.() || {};
-  const { MemoLoopItem, renderer } = MemoRenderer;
+  const { MemoLoopItem, renderer, getLoopItemExtraProps } = MemoRenderer;
   const [pageReady, setPageReady] = useState(false);
   const [hasMore, setHasMore] = useState(true);
   const [listData, setListData] = useState<any[]>([]);
+  const [pageLoad, setPageLoad] = useState(false);
   const listRef = useRef<any>({});
   const dynamicDataRef = useRef<DataRefProps>({
     total: total || 0,
     refreshing: false,
     currentPage: pageNum,
-    pageLoad: false,
   });
   const [isFullOfView, setIsFullOfView] = useState(false);
   const [showFooter, setShowFooter] = useState(false);
@@ -233,7 +232,8 @@ const DynamicList = LingxiForwardRef<any, MyDynamicListProps>((props, ref) => {
       dynamicDataRef.current?.resolve?.();
       if (dataSource) {
         // dynamicListDataChange(dataSource);
-        dynamicDataRef.current.pageLoad = false;
+        // dynamicDataRef.current.pageLoad = false;
+        setPageLoad(false);
       } else {
         setHasMore(false);
       }
@@ -333,13 +333,16 @@ const DynamicList = LingxiForwardRef<any, MyDynamicListProps>((props, ref) => {
   }, []);
 
   useEffect(() => {
-    if (dataSource && !dynamicDataRef.current.pageLoad) {
+    // FIXME: 可能在旧数据存在异常情况，可重点排查这里
+    if (dataSource && !pageLoad) {
+      // if (dataSource) {
       setPageReady(true);
       dynamicDataRef.current.total = Number(total);
-      dynamicDataRef.current.pageLoad = true;
+      // dynamicDataRef.current.pageLoad = true;
+      setPageLoad(true);
       dynamicListDataChange(dataSource);
     }
-  }, [dataSource]);
+  }, [dataSource, pageLoad]);
 
   const renderColumn = (columnData: any, i: any) => {
     const renderProps = {
@@ -351,6 +354,7 @@ const DynamicList = LingxiForwardRef<any, MyDynamicListProps>((props, ref) => {
       renderer,
       itemId: i,
       compId: props.$$componentItem.uid,
+      ...getLoopItemExtraProps?.(columnData, i),
     };
 
     if (swipe && swipeAction?.length && status !== '3') {

package/lib/h5public/src/components/factory/src/DynamicTable/Table.tsx

@@ -34,6 +34,7 @@ export interface MyDynamicTableProps {
   fixedRight?: boolean; // 尾列固定
   twoDimension: boolean; // 是否二维表格
   style: any;
+  visible: boolean;
   pagination: boolean;
   pageSize?: number;
   pageNum?: number;
@@ -55,7 +56,6 @@ export interface MyDynamicTableProps {
     cell: any,
     cellId: string,
   ) => void;
-  status: string;
   dataSourceLoading?: boolean;
   className?: string;
   currentData: any[];
@@ -89,7 +89,7 @@ const DynamicTable = LingxiForwardRef<any, MyDynamicTableProps>(
       onPageChange,
       onRowClick,
       onTableCellClick,
-      status,
+      visible = true,
       // dataSourceLoading = false,
       $$componentItem,
       className,
@@ -491,7 +491,7 @@ const DynamicTable = LingxiForwardRef<any, MyDynamicTableProps>(
 
     return (
       <>
-        {status === '1' && (
+        {visible === true && (
           <div className={`${prefixCls} ${className}`} style={style}>
             {showHead && tableTitle && (
               <div className="table-header">{tableTitle}</div>

package/lib/h5public/src/components/factory/src/LoadMore/index.tsx

@@ -33,7 +33,7 @@ const LoadMore = AppForwardRef<MyListViewProps>((props, ref) => {
   } = props;
 
   const { MemoRenderer } = props.getEngineApis();
-  const { MemoLoopItem, renderer } = MemoRenderer;
+  const { MemoLoopItem, renderer, getLoopItemExtraProps } = MemoRenderer;
 
   const loadMoreParamsRef = useRef({});
   const loadMoreRef = useRef<any>(null);
@@ -51,6 +51,7 @@ const LoadMore = AppForwardRef<MyListViewProps>((props, ref) => {
       renderer,
       itemId: i,
       compId: props.$$componentItem.uid,
+      ...getLoopItemExtraProps?.(columnData, i),
     };
     return (
       <div className={`${prefixCls}-column`} key={i}>

package/lib/h5public/src/components/factory/src/Loop/index.tsx

@@ -33,7 +33,7 @@ const Loop = LingxiForwardRef<any, MyLoopprops>((props, ref) => {
   } = props;
 
   const { MemoRenderer, getAppFileUrlByFileCode } = props.getEngineApis();
-  const { MemoLoopItem, renderer } = MemoRenderer;
+  const { MemoLoopItem, renderer, getLoopItemExtraProps } = MemoRenderer;
   const [dataSource, setDataSource] = useState(
     Array.isArray(myDataSource) ? myDataSource : [],
   );
@@ -90,6 +90,7 @@ const Loop = LingxiForwardRef<any, MyLoopprops>((props, ref) => {
           key: item[uniqueField] ?? i,
           itemId: item[uniqueField] ?? i,
           compId: props.$$componentItem.uid,
+          ...getLoopItemExtraProps?.(item, i),
         };
         return <MemoLoopItem {...renderProps} />;
       })}

package/lib/h5public/src/components/factory/src/RemoteComponent/components/ReactRender.tsx

@@ -2,7 +2,9 @@ import { LingXiFC } from '@lingxiteam/types';
 import { createRequires } from '@paciolan/remote-component/dist/createRequires';
 import { createUseRemoteComponent } from '@paciolan/remote-component/dist/hooks/useRemoteComponent';
 import { ErrorBlock } from 'antd-mobile-5';
+import { useContext } from 'react';
 import { useDynamicData } from '../../utils/dynamicUtils/DynamicContext';
+import { DFormContext } from '../../utils/form';
 import { IconFailComp } from '../assets';
 import RemoteCompConfig from '../remote-component.config';
 
@@ -15,17 +17,31 @@ export interface MyRemoteComponentProps {
   url?: string;
   customProps: any;
   useRemoteComponent?: any; // 自定义组件调用依赖的模块，可由调用方传入
+  forwardRef?: any;
+  // 如果在动态容器里面，传入表单的name
+  name?: string;
+  // 如果在动态容器里面，传入表单fieldName
+  fieldName?: string;
 }
 
 // const prefixCls = 'remoteComponent';
 const RemoteComponent: LingXiFC<MyRemoteComponentProps> = (props) => {
-  const { url, customProps, getEngineApis, ...restProps } = props;
+  const {
+    url,
+    customProps,
+    getEngineApis,
+    forwardRef,
+    name,
+    fieldName,
+    ...restProps
+  } = props;
 
   const engineApis = getEngineApis?.() || {};
 
   const useRemoteComponentInst = props.useRemoteComponent || useRemoteComponent;
 
   const dynamicDataContext = useDynamicData();
+  const { formCode } = useContext(DFormContext) || {};
 
   const [loading, err, Component] = useRemoteComponentInst(url);
 
@@ -53,7 +69,8 @@ const RemoteComponent: LingXiFC<MyRemoteComponentProps> = (props) => {
     <Component
       {...restProps}
       {...customProps}
-      $lxApi={{ form: dynamicDataContext.form }}
+      $lxApi={{ form: dynamicDataContext.form, formCode, fieldName, name }}
+      ref={forwardRef}
     />
   );
 };

package/lib/h5public/src/components/factory/src/RemoteComponent/constant.ts

@@ -2,6 +2,41 @@ import FishRender from './components/FishRender';
 import ReactRender from './components/ReactRender';
 import VueRender from './components/VueRender';
 
+/**
+ * 合并方法，支持对象中包含getter方法
+ * @param object
+ * @param otherArgs
+ */
+export function mergeGetter<
+  T extends Record<string, any>,
+  S1 extends Record<string, any>,
+  S2 extends Record<string, any>,
+>(object: T, source1: S1, ...args: S2[]) {
+  const target: Record<string, any> = object || {};
+
+  // 合并ref 保持getter对象不被转义
+  const merge = (o: Record<string, any> = {}) => {
+    Object.keys(o).forEach((key) => {
+      const descriptor = Object.getOwnPropertyDescriptor(o, key);
+      if (descriptor) {
+        Object.defineProperty(target, key, descriptor!);
+      } else {
+        try {
+          target[key] = o[key];
+          // eslint-disable-next-line no-empty
+        } catch {}
+      }
+    });
+  };
+
+  const sources: (S1 | S2)[] = [source1, ...args];
+
+  sources.forEach((source) => {
+    merge(source);
+  });
+
+  return target as any;
+}
 export const RemoteComponentMap = {
   React: ReactRender,
   Vue: VueRender,

package/lib/h5public/src/components/factory/src/RemoteComponent/index.tsx

@@ -1,7 +1,7 @@
 import { LingxiForwardRef } from '@lingxiteam/types';
-import { useEffect, useImperativeHandle, useState } from 'react';
+import { useEffect, useImperativeHandle, useRef, useState } from 'react';
 import { useDeepCompareEffect } from '../utils/ahooks';
-import { RemoteComponentMap } from './constant';
+import { mergeGetter, RemoteComponentMap } from './constant';
 
 export interface MyRemoteComponentProps {
   url: string;
@@ -28,6 +28,8 @@ const RemoteComponent = LingxiForwardRef<any, MyRemoteComponentProps>(
     const [remoteUrl, setRemoteUrl] = useState<string>(url || '');
     const engineApis = getEngineApis();
     const [customProps, setProps] = useState<any>(myProps);
+    const [myRefs, setMyRefs] = useState<any>();
+    const isDid = useRef(false);
     useDeepCompareEffect(() => {
       setProps(myProps);
     }, [myProps]);
@@ -40,19 +42,24 @@ const RemoteComponent = LingxiForwardRef<any, MyRemoteComponentProps>(
       }
     }, [url, fileCode]);
 
-    useImperativeHandle(ref, () => ({
-      setCompProps: (params: any) => {
-        setProps({ ...customProps, ...params });
-      },
-      setSrc: (src: string) => {
-        if (src.startsWith('http')) {
-          setRemoteUrl(src);
-        } else {
-          // 怀疑是文件id
-          setRemoteUrl(engineApis?.getAppFileUrlByFileCode(src));
-        }
-      },
-    }));
+    useImperativeHandle(
+      ref,
+      () =>
+        mergeGetter(myRefs || {}, {
+          setCompProps: (params: any) => {
+            setProps({ ...customProps, ...params });
+          },
+          setSrc: (src: string) => {
+            if (src.startsWith('http')) {
+              setRemoteUrl(src);
+            } else {
+              // 怀疑是文件id
+              setRemoteUrl(engineApis?.getAppFileUrlByFileCode(src));
+            }
+          },
+        }),
+      [myRefs],
+    );
 
     if (!visible) {
       return <></>;
@@ -66,6 +73,12 @@ const RemoteComponent = LingxiForwardRef<any, MyRemoteComponentProps>(
         customProps={customProps}
         url={remoteUrl}
         getEngineApis={getEngineApis}
+        forwardRef={(refs: any) => {
+          if (refs && isDid.current === false) {
+            isDid.current = true;
+            setMyRefs(refs);
+          }
+        }}
       />
     );
   },

package/lib/h5public/src/components/factory/src/Selector/LxSelector.tsx

@@ -52,6 +52,9 @@ const LxSelector = LingxiForwardRef<any, SelectorProps>((props, ref) => {
     ...restProps
   } = props;
   const { getLocale } = getEngineApis?.() || {};
+  const [imgSrc, setImgSrc] = useState<string>();
+  const [curValue, setCurValue] = useState<any>([]);
+  const [curOptions, setCurOptions] = useState<any[]>([]);
   const imperativeHandle = {
     // eslint-disable-next-line consistent-return
     getSelectedData: () => {
@@ -124,15 +127,15 @@ const LxSelector = LingxiForwardRef<any, SelectorProps>((props, ref) => {
         setCurOptions(newOptions);
       }
     },
+    setValue: (v: any) => {
+      setCurValue(v);
+    },
   };
 
   const { getAppFileUrlByFileCode } = getEngineApis();
 
   const { isForm, form, disabled, onInputChange, visible, getRules } =
     useFormItem(ref, props as any, imperativeHandle);
-  const [imgSrc, setImgSrc] = useState<string>();
-  const [curValue, setCurValue] = useState<any>([]);
-  const [curOptions, setCurOptions] = useState<any[]>([]);
   const myColumns: any = () => {
     switch (columns) {
       case 'customize':

package/lib/h5public/src/components/factory/src/utils/form.ts

@@ -8,6 +8,8 @@ export interface DFormContextProps {
   visible?: boolean;
   isForm?: boolean;
   error?: any;
+  // 表单编码
+  formCode?: string;
   form?: FormInstance;
   formListRef?: any;
   allDisabled?: boolean;

package/lib/h5public/src/utils/formUtils.ts

@@ -181,14 +181,20 @@ export const getFormsByCompName = (
 ) => {
   const { refs, renderRefs } = options;
 
-  Object.keys(refs).forEach((uid) => {
+  Object.keys(refs || {}).forEach((uid) => {
     const item = refs[uid];
     if (!item) return;
     if (item.compName === 'DForm') {
       forms.push(item);
     }
     if (['Pageview', 'BOFramer'].includes(item.compName)) {
-      getFormsByCompName(renderRefs.getComRefs(uid));
+      getFormsByCompName(
+        {
+          refs: renderRefs.getComRefs(uid),
+          renderRefs,
+        },
+        forms,
+      );
     }
   });
 
@@ -219,7 +225,7 @@ export const validateFields = async (
       }
     });
   });
-  return values;
+  return formValues;
 };
 
 // // eslint-disable-next-line max-len

package/lib/h5public/src/utils/messageApi.ts

@@ -110,7 +110,7 @@ const showAlert = ({
 };
 
 // 兼容pc端Modal
-const Modal = {
+const MessageApiModal = {
   success: showAlert,
   info: showAlert,
   warning: showAlert,
@@ -118,4 +118,4 @@ const Modal = {
   confirm: showAlert,
 };
 
-export { messageApi, Modal, Spin };
+export { messageApi, MessageApiModal, Spin };

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

@@ -172,12 +172,12 @@ const CollapsePanel = LingxiForwardRef<any, MyCollapsePanelProps>(
         props.$$componentItem.uid,
         renderRef,
       );
-    }, []);
+    }, [children]);
 
     useUpdateEffect(() => {
       // 监听需要更新的属性
       childRenderContext.update?.();
-    }, [visible]);
+    }, [visible, children]);
 
     return null;
   },

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

@@ -381,7 +381,7 @@ const Form = LingxiForwardRef<any, FormProps>((props, ref) => {
             typeof onValuesChange === 'function'
           ) {
             if (
-              engineApis?.compatConfig.cmd.setFieldsValueToOnValuesChange ===
+              engineApis?.compatConfig?.cmd?.setFieldsValueToOnValuesChange ===
               true
             ) {
               onValuesChange(key, target[key]);

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

@@ -232,7 +232,7 @@ const MyGrid = (props: MyGridView) => {
   } = props;
   const [values, setValues] = useState(defaultValue);
   const { MemoRenderer } = props.getEngineApis?.();
-  const { MemoLoopItem, renderer } = MemoRenderer;
+  const { MemoLoopItem, renderer, getLoopItemExtraProps } = MemoRenderer;
 
   useEffect(() => {
     if (value !== undefined) {
@@ -333,6 +333,7 @@ const MyGrid = (props: MyGridView) => {
             item,
             i: index,
           },
+          ...getLoopItemExtraProps?.(item, index),
         };
 
         return (

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

@@ -421,7 +421,7 @@ const MyGrid = (props: MyLoopList) => {
   }, []);
 
   const { MemoRenderer } = props.getEngineApis?.();
-  const { MemoLoopItem, renderer } = MemoRenderer;
+  const { MemoLoopItem, renderer, getLoopItemExtraProps } = MemoRenderer;
 
   return (
     <Row gutter={[vspace, hspace]} style={{ ...backgroundStyle, ...style }}>
@@ -448,6 +448,7 @@ const MyGrid = (props: MyLoopList) => {
               item,
               i: index,
             },
+            ...getLoopItemExtraProps?.(item, index),
           };
 
           return (

package/lib/pcpublic/src/components/pcfactory/src/RemoteComponent/components/ReactRender.tsx

@@ -16,11 +16,16 @@ export interface MyRemoteComponentProps {
   customProps: any;
   useRemoteComponent?: any; // 自定义组件调用依赖的模块，可由调用方传入
   forwardRef?: any;
+  // 如果在动态容器里面，传入表单的name
+  name?: string;
+  // 如果在动态容器里面，传入表单fieldName
+  fieldName?: string;
 }
 
 // const prefixCls = 'remoteComponent';
 const RemoteComponent: LingXiFC<MyRemoteComponentProps> = (props) => {
-  const { url, customProps, getEngineApis, ...restProps } = props;
+  const { url, customProps, getEngineApis, name, fieldName, ...restProps } =
+    props;
 
   const engineApis = getEngineApis?.() || {};
 
@@ -50,7 +55,12 @@ const RemoteComponent: LingXiFC<MyRemoteComponentProps> = (props) => {
     <Component
       {...restProps}
       {...customProps}
-      $lxApi={{ form: dynamicDataContext.form, formCode: formContext.formCode }}
+      $lxApi={{
+        form: dynamicDataContext.form,
+        formCode: formContext.formCode,
+        name,
+        fieldName,
+      }}
       ref={props.forwardRef}
     />
   );

package/lib/pcpublic/src/components/pcfactory/src/RichTextEditor/LcdpUeditorMain.tsx

@@ -9,9 +9,10 @@ import {
 } from '../utils';
 import { useLocale } from '../utils/hooks/useLocale';
 import { renderRichText } from '../utils/renderReadOnly';
+import { DEFAULT_TOOLBARS, DEFAULT_TOOLBARS_GROUP } from './const';
 
 const LcdpUeditorMain: LingXiFC<{ [key: string]: any }> = (props) => {
-  const { value, onChange, style, className, rootRef: ref } = props;
+  const { value, onChange, style, className, rootRef: ref, funcTypes } = props;
   const editorRef = useRef<ILcdpUeditorInst | null>(null);
 
   const engineApis = props.getEngineApis();
@@ -36,6 +37,36 @@ const LcdpUeditorMain: LingXiFC<{ [key: string]: any }> = (props) => {
     [required, name, lang],
   );
 
+  const toolbars = useMemo(() => {
+    if (funcTypes) {
+      const { accept = '' } = funcTypes;
+      const filterBars: string[] = [];
+      const checkBarArrs: string[] = accept
+        .split(',')
+        .filter((str: string) => str.length);
+      if (checkBarArrs.length) {
+        DEFAULT_TOOLBARS_GROUP.forEach((rows: string[], index: number) => {
+          let curItemCheckNum = 0;
+          rows.forEach((str: string) => {
+            if (checkBarArrs.includes(str)) {
+              if (str !== 'fullscreen') curItemCheckNum += 1;
+              filterBars.push(str);
+            }
+          });
+          if (curItemCheckNum && index !== DEFAULT_TOOLBARS_GROUP.length - 1) {
+            filterBars.push('|');
+          }
+        });
+        if (filterBars[filterBars.length - 1] === '|') {
+          filterBars.pop();
+        }
+        return [filterBars];
+      }
+      return [[]];
+    }
+    return DEFAULT_TOOLBARS;
+  }, [funcTypes]);
+
   const getLang = useMemo<any>(() => {
     const langStr = lang.toLowerCase();
     switch (langStr) {
@@ -72,7 +103,9 @@ const LcdpUeditorMain: LingXiFC<{ [key: string]: any }> = (props) => {
         config={{
           imageType: props.imageType,
           height: props.height,
+          maximumWords: props.maximumWords,
         }}
+        toolbars={toolbars}
         uploadFunction={async (file) => {
           const formData = new FormData();
           formData.append('attach', file, file.name);

package/lib/pcpublic/src/components/pcfactory/src/RichTextEditor/const.ts

@@ -0,0 +1,205 @@
+export const DEFAULT_TOOLBARS_GROUP = [
+  [
+    'fullscreen', // 全屏
+    'source', // 源代码
+  ],
+  [
+    'undo', // 撤销
+    'redo', // 重做
+  ],
+  [
+    'bold', // 加粗
+    'italic', // 斜体
+    'underline', // 下划线
+    'fontborder', // 字符边框
+    'strikethrough', // 删除线
+    'superscript', // 上标
+    'subscript', // 下标
+    'removeformat', // 清除格式
+    'formatmatch', // 格式刷
+    'autotypeset', // 自动排版
+    'blockquote', // 引用
+    'pasteplain', // 纯文本粘贴模式
+  ],
+  [
+    'forecolor', // 字体颜色
+    'backcolor', // 背景色
+    'insertorderedlist', // 有序列表
+    'insertunorderedlist', // 无序列表
+    'selectall', // 全选
+    'cleardoc', // 清空文档
+  ],
+  [
+    'rowspacingtop', // 段前距
+    'rowspacingbottom', // 段后距
+    'lineheight', // 行间距
+  ],
+  [
+    'customstyle', // 自定义标题
+    'paragraph', // 段落格式
+    'fontfamily', // 字体
+    'fontsize', // 字号
+  ],
+  [
+    'directionalityltr', // 从左向右输入
+    'directionalityrtl', // 从右向左输入
+    'indent', // 首行缩进
+  ],
+  [
+    'justifyleft', // 居左对齐
+    'justifycenter', // 居中对齐
+    'justifyright',
+    'justifyjustify', // 两端对齐
+  ],
+  [
+    'touppercase', // 字母大写
+    'tolowercase', // 字母小写
+  ],
+  [
+    'link', // 超链接
+    'unlink', // 取消链接
+    'anchor', // 锚点
+  ],
+  [
+    'imagenone', // 图片默认
+    'imageleft', // 图片左浮动
+    'imageright', // 图片右浮动
+    'imagecenter', // 图片居中
+  ],
+  [
+    'simpleupload', // 单图上传
+    'insertimage', // 多图上传
+    'insertvideo', // 视频
+    'insertaudio', // 音频
+    'attachment', // 附件
+    'insertframe', // 插入Iframe
+    'insertcode', // 插入代码
+    'pagebreak', // 分页
+    'background', // 背景
+  ],
+  [
+    'horizontal', // 分隔线
+    'date', // 日期
+    'time', // 时间
+    'spechars', // 特殊字符
+  ],
+  [
+    'inserttable', // 插入表格
+    'deletetable', // 删除表格
+    'insertparagraphbeforetable', // 表格前插入行
+    'insertrow', // 前插入行
+    'deleterow', // 删除行
+    'insertcol', // 前插入列
+    'deletecol', // 删除列
+    'mergecells', // 合并多个单元格
+    'mergeright', // 右合并单元格
+    'mergedown', // 下合并单元格
+    'splittocells', // 完全拆分单元格
+    'splittorows', // 拆分成行
+    'splittocols', // 拆分成列
+  ],
+  [
+    'print', // 打印
+  ],
+];
+
+export const DEFAULT_TOOLBARS = [
+  [
+    'fullscreen', // 全屏
+    'source', // 源代码
+    '|',
+    'undo', // 撤销
+    'redo', // 重做
+    '|',
+    'bold', // 加粗
+    'italic', // 斜体
+    'underline', // 下划线
+    'fontborder', // 字符边框
+    'strikethrough', // 删除线
+    'superscript', // 上标
+    'subscript', // 下标
+    'removeformat', // 清除格式
+    'formatmatch', // 格式刷
+    'autotypeset', // 自动排版
+    'blockquote', // 引用
+    'pasteplain', // 纯文本粘贴模式
+    '|',
+    'forecolor', // 字体颜色
+    'backcolor', // 背景色
+    'insertorderedlist', // 有序列表
+    'insertunorderedlist', // 无序列表
+    'selectall', // 全选
+    'cleardoc', // 清空文档
+    '|',
+    'rowspacingtop', // 段前距
+    'rowspacingbottom', // 段后距
+    'lineheight', // 行间距
+    '|',
+    'customstyle', // 自定义标题
+    'paragraph', // 段落格式
+    'fontfamily', // 字体
+    'fontsize', // 字号
+    '|',
+    'directionalityltr', // 从左向右输入
+    'directionalityrtl', // 从右向左输入
+    'indent', // 首行缩进
+    '|',
+    'justifyleft', // 居左对齐
+    'justifycenter', // 居中对齐
+    'justifyright',
+    'justifyjustify', // 两端对齐
+    '|',
+    'touppercase', // 字母大写
+    'tolowercase', // 字母小写
+    '|',
+    'link', // 超链接
+    'unlink', // 取消链接
+    'anchor', // 锚点
+    '|',
+    'imagenone', // 图片默认
+    'imageleft', // 图片左浮动
+    'imagecenter', // 图片居中
+    'imageright', // 图片右浮动
+    '|',
+    'simpleupload', // 单图上传
+    'insertimage', // 多图上传
+    // "emotion",             // 表情
+    // "scrawl",              // 涂鸦
+    'insertvideo', // 视频
+    'insertaudio', // 音频
+    'attachment', // 附件
+    'insertframe', // 插入Iframe
+    'insertcode', // 插入代码
+    'pagebreak', // 分页
+    // "template",            // 模板
+    'background', // 背景
+    // "formula",             // 公式
+    '|',
+    'horizontal', // 分隔线
+    'date', // 日期
+    'time', // 时间
+    'spechars', // 特殊字符
+    // "wordimage",           // Word图片转存
+    '|',
+    'inserttable', // 插入表格
+    'deletetable', // 删除表格
+    'insertparagraphbeforetable', // 表格前插入行
+    'insertrow', // 前插入行
+    'deleterow', // 删除行
+    'insertcol', // 前插入列
+    'deletecol', // 删除列
+    'mergecells', // 合并多个单元格
+    'mergeright', // 右合并单元格
+    'mergedown', // 下合并单元格
+    'splittocells', // 完全拆分单元格
+    'splittorows', // 拆分成行
+    'splittocols', // 拆分成列
+    '|',
+    'print', // 打印
+    // "preview",             // 预览
+    // "searchreplace",       // 查询替换
+    // "|",
+    // "contentimport",
+    // "help",                // 帮助
+  ],
+];

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

@@ -24,6 +24,7 @@ export interface MyStepsProps {
   stepStyle: 'number' | 'icon' | 'dot';
   size: 'small' | 'default';
   iconSetting: IconSettingItem[];
+  onClick?: (value: number, obj: any) => void;
 }
 
 interface IconSettingItem {
@@ -73,6 +74,7 @@ const MySteps = LingxiForwardRef<any, MyStepsProps>((props, ref) => {
     size,
     iconSetting = getDefaultIconSetting(getLocale),
     alias = {},
+    onClick,
     ...restProps
   } = props;
   const {
@@ -314,7 +316,17 @@ const MySteps = LingxiForwardRef<any, MyStepsProps>((props, ref) => {
       labelPlacement={stepStyle === 'dot' ? 'vertical' : labelPlacement} // 点状标签位置只能在下方
       current={current}
       onChange={(c) => {
-        if (onChange && !innerDataSource[c]?.[disabledAlias]) {
+        // 如果配置了点击事件，优先执行点击事件，不更改步骤状态，如果没有点击事件，有值变化回掉事件，更改步骤状态
+        if (
+          typeof onClick === 'function' &&
+          !innerDataSource[c]?.[disabledAlias]
+        ) {
+          onClick(c, innerDataSource[c]);
+          // 如果有配置值变化回掉事件，也执行值变化回掉事件，但是不切换步骤状态
+          if (typeof onChange === 'function') {
+            onChange(c, innerDataSource[c]);
+          }
+        } else if (onChange && !innerDataSource[c]?.[disabledAlias]) {
           onChange(c, innerDataSource[c]);
           onCurrentChange(c);
         }

package/lib/pcpublic/src/components/pcfactory/src/Table/hooks/useColumns.tsx

@@ -1258,10 +1258,10 @@ const useColumns = (props: any) => {
         const isLineNumSet =
           c.lineNum && typeof c.lineNum === 'number' && c.lineNum > 0;
         if (isLineNumSet) {
-          const lineHeight = size === 'small' ? 16 : 20;
+          // const lineHeight = size === 'small' ? 16 : 20;
           controllLineStyle = {
-            lineHeight: `${lineHeight}px`,
-            maxHeight: `${lineHeight * c.lineNum}px`,
+            // lineHeight: `${lineHeight}px`,
+            // maxHeight: `${lineHeight * c.lineNum}px`,
             WebkitLineClamp: c.lineNum,
           };
         }

package/lib/pcpublic/src/components/pcfactory/src/styles/components/Table.less

@@ -962,6 +962,7 @@
     border-radius: 14px;
     border: 1px solid transparent;
     padding: 0 6px;
+    vertical-align: middle;
   }
 
   .ued-table-cell-pointTag {

package/lib/public/src/utils/LcdpTerminalType.ts

@@ -0,0 +1,132 @@
+export const PlatformOS = () => {
+  const userAgent = window.navigator.userAgent.toLowerCase();
+  return {
+    get iOS() {
+      if (
+        userAgent.indexOf('ios') !== -1 ||
+        userAgent.indexOf('iphone') !== -1
+      ) {
+        return true;
+      }
+      return false;
+    },
+    get Android() {
+      if (userAgent.indexOf('android') !== -1) {
+        return true;
+      }
+      return false;
+    },
+    get WeChat() {
+      if (userAgent.indexOf('/micromessenger/i') !== -1) {
+        return true;
+      }
+      return false;
+    },
+    get Dingtalk() {
+      if (userAgent.indexOf('/dingtalk/i') !== -1) {
+        return true;
+      }
+      return false;
+    },
+    get Chrome() {
+      if (userAgent.indexOf('Chrome') !== -1) {
+        return true;
+      }
+      return false;
+    },
+    get Firefox() {
+      if (userAgent.indexOf('Firefox') !== -1) {
+        return true;
+      }
+      return false;
+    },
+    get Safari() {
+      if (userAgent.indexOf('Safari') !== -1) {
+        return true;
+      }
+      return false;
+    },
+    get Edge() {
+      if (userAgent.indexOf('Edge') !== -1) {
+        return true;
+      }
+      return false;
+    },
+    get IE() {
+      if (userAgent.indexOf('Trident') !== -1) {
+        return true;
+      }
+      return false;
+    },
+    get Name() {
+      if (
+        userAgent.indexOf('ios') !== -1 ||
+        userAgent.indexOf('iphone') !== -1
+      ) {
+        return 'ios';
+      }
+      if (userAgent.indexOf('android') !== -1) {
+        return 'android';
+      }
+      if (userAgent.indexOf('/micromessenger/i') !== -1) {
+        return 'wechat';
+      }
+      if (userAgent.indexOf('/dingtalk/i') !== -1) {
+        return 'dingtalk';
+      }
+      if (userAgent.indexOf('Chrome') !== -1) {
+        return 'chrome';
+      }
+      if (userAgent.indexOf('Firefox') !== -1) {
+        return 'firefox';
+      }
+      if (userAgent.indexOf('Safari') !== -1) {
+        return 'safari';
+      }
+      if (userAgent.indexOf('Edge') !== -1) {
+        return 'edge';
+      }
+      if (userAgent.indexOf('Trident') !== -1) {
+        return 'ie';
+      }
+      return 'other';
+    },
+    get isIponeliuHaiping() {
+      if (this.iOS) {
+        // 获取屏幕高度和宽度
+        const screenHeight = window.screen.height;
+        const screenWidth = window.screen.width;
+        // iPhone X/XS/11 Pro等的分辨率为1125x2436
+        // iPhone XR/11的分辨率为828x1792
+        // iPhone XS Max/11 Pro Max的分辨率为1242x2688
+        if (
+          (screenHeight === 812 && screenWidth === 375) || // iPhone X/XS/11 Pro
+          (screenHeight === 896 && screenWidth === 414)
+        ) {
+          // iPhone XR/11/11 Pro Max
+          return true;
+        }
+        return false;
+      }
+      return false;
+    },
+  };
+};
+
+export const LcdpTerminalType = {
+  isIOS: PlatformOS().iOS,
+  isAndroid: PlatformOS().Android,
+  isIE: PlatformOS().IE,
+  isWeChat: PlatformOS().WeChat,
+  isChrome: PlatformOS().Chrome,
+  isSafari: PlatformOS().Safari,
+  isEdge: PlatformOS().Edge,
+  isDingtalk: PlatformOS().Dingtalk,
+
+  Name: PlatformOS().Name,
+
+  /**
+   * 是否是iphone的刘海屏
+   */
+  isIphonex: PlatformOS().isIponeliuHaiping,
+};

package/lib/public/src/utils/array.ts

@@ -1,4 +1,4 @@
-import { get, isArray, mergeWith, set } from 'lodash';
+import { get, isArray, isPlainObject, mergeWith, set } from 'lodash';
 
 /**
  * 往数组中添加数据元素
@@ -142,6 +142,36 @@ const updateObject = (options: {
   return newData;
 };
 
+/**
+ * 树状结构扁平化成数组对象
+ * @param origin
+ * @param deepPath
+ * @returns
+ */
+export const flattenArr = (
+  origin: Record<string, any> | Record<string, any>[],
+  deepPath: string,
+) => {
+  const target: any = [];
+
+  const treeLoop = (data?: any) => {
+    const arr = get(data, deepPath);
+    if (Array.isArray(arr)) {
+      target.push(...arr);
+      arr.forEach(treeLoop);
+    }
+  };
+
+  if (Array.isArray(origin)) {
+    target.push(...origin);
+    origin.forEach(treeLoop);
+  } else if (isPlainObject(origin)) {
+    treeLoop(origin);
+  }
+
+  return target;
+};
+
 export default {
   remove,
   push,

package/lib/public/src/utils/compatible.ts

@@ -0,0 +1,31 @@
+export default {
+  visible: (visible: any) => {
+    if (typeof visible === 'boolean') {
+      return visible;
+    }
+    if (typeof visible === 'string') {
+      // 兼容PC 1是普通，2是隐藏的写法
+      if (visible === '1') {
+        return true;
+      }
+      if (visible === '2') {
+        return false;
+      }
+      if (visible.toLowerCase() === 'false') {
+        return false;
+      }
+      if (visible.toLowerCase() === 'true') {
+        return true;
+      }
+    }
+    if (typeof visible === 'number') {
+      if (visible === 1) {
+        return true;
+      }
+      if (visible === 2 || visible === 0) {
+        return false;
+      }
+    }
+    return true;
+  },
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingxiteam/ebe-utils",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "description": "",
   "keywords": [],
   "author": "",
@@ -17,7 +17,7 @@
     "@babel/parser": "^7.12.12",
     "@babel/traverse": "^7.12.12",
     "@babel/types": "^7.12.12",
-    "@lingxiteam/ebe": "0.0.22",
+    "@lingxiteam/ebe": "0.0.24",
     "cac": "^6.7.14",
     "fs-extra": "9.x"
   },