@lingxiteam/ebe-utils 0.2.4 → 0.2.5

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

@@ -1,15 +1,7 @@
 import { LingxiForwardRef } from '@lingxiteam/types';
 import { Col, Row } from 'antd';
 import classNames from 'classnames';
-import React, {
-  createContext,
-  useCallback,
-  useEffect,
-  useImperativeHandle,
-  useMemo,
-  useRef,
-  useState,
-} from 'react';
+import React, { createContext, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { useListenProps } from '../utils';
 import { IconCheckSvg, IconNormalCheckSvg } from '../utils/common';
 
@@ -52,9 +44,7 @@ const gridViewCls = 'ued-grid-view';
 
 const WrapperEditorComp: React.FC<WrapperProps> = ({ children }) =>
   React.cloneElement(children, {
-    className: `${gridViewCls}-item ${gridViewCls}-item-edit ${
-      children.props.className || ''
-    }`,
+    className: `${gridViewCls}-item ${gridViewCls}-item-edit ${children.props.className || ''}`,
   });
 
 const WrapperDisableComps: React.FC<WrapperProps> = ({ children }) =>
@@ -72,30 +62,17 @@ const renderIcon = ({ checked, selectImg, normalImg }: any) => {
   if (normalImg) {
     return <img src={normalImg} className={`${gridViewCls}-icon`} alt="" />;
   }
-  return (
-    <img src={IconNormalCheckSvg} className={`${gridViewCls}-icon`} alt="" />
-  );
+  return <img src={IconNormalCheckSvg} className={`${gridViewCls}-icon`} alt="" />;
 };
 
-const NoCheckBox = (item: {
-  children: any;
-  checked: any;
-  itemStyle: any;
-  index: any;
-  disabled?: false | undefined;
-  onChange: any;
-}) => {
+const NoCheckBox = (item: { children: any; checked: any; itemStyle: any; index: any; disabled?: false | undefined; onChange: any }) => {
   const { children, checked, itemStyle, onChange } = item;
   return (
     <div
       style={itemStyle}
-      className={classNames(
-        `${gridViewCls}-blockSelect`,
-        `${gridViewCls}-nobox`,
-        {
-          [`${gridViewCls}-select`]: checked,
-        },
-      )}
+      className={classNames(`${gridViewCls}-blockSelect`, `${gridViewCls}-nobox`, {
+        [`${gridViewCls}-select`]: checked,
+      })}
       onClick={onChange}
     >
       <div className={classNames(`${gridViewCls}-content`)}>{children}</div>
@@ -116,16 +93,8 @@ const CheckBox = (item: {
   const { children, selectImg, normalImg, checked, itemStyle, onChange } = item;
 
   return (
-    <div
-      style={itemStyle}
-      className={classNames(
-        `${gridViewCls}-blockSelect`,
-        `${gridViewCls}-showIcon`,
-      )}
-    >
-      <div onClick={() => onChange(item)}>
-        {renderIcon({ checked, selectImg, normalImg })}
-      </div>
+    <div style={itemStyle} className={classNames(`${gridViewCls}-blockSelect`, `${gridViewCls}-showIcon`)}>
+      <div onClick={() => onChange(item)}>{renderIcon({ checked, selectImg, normalImg })}</div>
       <div className={classNames(`${gridViewCls}-content`)}>{children}</div>
     </div>
   );
@@ -143,40 +112,15 @@ const EditorComp = (props: {
   checked: any;
   className: any;
 }) => {
-  const {
-    isChecked,
-    children,
-    item,
-    index,
-    valueKey,
-    colProps = {},
-    onChange,
-    itemStyle,
-    checked,
-    className,
-  } = props;
+  const { isChecked, children, item, index, valueKey, colProps = {}, onChange, itemStyle, checked, className } = props;
   return (
     <Col {...colProps} className={className}>
       {isChecked ? (
-        <CheckBox
-          index={index}
-          key={item[valueKey]}
-          {...item}
-          checked={checked}
-          itemStyle={itemStyle}
-          onChange={() => onChange(item, index)}
-        >
+        <CheckBox index={index} key={item[valueKey]} {...item} checked={checked} itemStyle={itemStyle} onChange={() => onChange(item, index)}>
           {children}
         </CheckBox>
       ) : (
-        <NoCheckBox
-          index={index}
-          key={item[valueKey]}
-          {...item}
-          itemStyle={itemStyle}
-          onChange={() => onChange(item, index)}
-          checked={checked}
-        >
+        <NoCheckBox index={index} key={item[valueKey]} {...item} itemStyle={itemStyle} onChange={() => onChange(item, index)} checked={checked}>
           {children}
         </NoCheckBox>
       )}
@@ -184,13 +128,7 @@ const EditorComp = (props: {
   );
 };
 
-const DisabledComps = (props: {
-  children: any;
-  index: any;
-  itemStyle: any;
-  colProps: any;
-  className: any;
-}) => {
+const DisabledComps = (props: { children: any; index: any; itemStyle: any; colProps: any; className: any }) => {
   const { children, index, itemStyle, colProps, className } = props || {};
   const item = children?.props?.$props;
   return (
@@ -245,8 +183,7 @@ const MyGrid = (props: MyGridView) => {
 
   const onChange = (restItem: Record<string, any>, index: any) => {
     // eslint-disable-next-line @typescript-eslint/no-shadow
-    const value =
-      typeof restItem === 'object' ? restItem[valueKey || 'value'] : index;
+    const value = typeof restItem === 'object' ? restItem[valueKey || 'value'] : index;
     if (!isMultiple) {
       setValues([value]);
       if (uOnChange) {
@@ -303,7 +240,7 @@ const MyGrid = (props: MyGridView) => {
       }
       return p;
     },
-    [mediaLayout, span, fixedWidth],
+    [mediaLayout, span, fixedWidth]
   );
 
   // 循环列表配置key
@@ -317,8 +254,7 @@ const MyGrid = (props: MyGridView) => {
         const restItem = item;
         const checked = getChecked(restItem, index);
         const itemStyle = !isEditor ? basicStyle : getItemStyle(checked);
-        const gridViewIndex =
-          restItem[valueKey] ?? `${$$componentItem.uid}_${index}`;
+        const gridViewIndex = restItem[valueKey] ?? `${$$componentItem.uid}_${index}`;
 
         const renderProps = {
           itemKey,
@@ -337,7 +273,7 @@ const MyGrid = (props: MyGridView) => {
         };
 
         return (
-          <>
+          <React.Fragment key={gridViewIndex}>
             {isEditor ? (
               <WrapperEditorComp>
                 <EditorComp
@@ -373,7 +309,7 @@ const MyGrid = (props: MyGridView) => {
                 </DisabledComps>
               </WrapperDisableComps>
             )}
-          </>
+          </React.Fragment>
         );
       })}
     </Row>
@@ -381,14 +317,7 @@ const MyGrid = (props: MyGridView) => {
 };
 
 const SyncGridView = LingxiForwardRef((props: any, ref) => {
-  const {
-    defaultValue,
-    value,
-    valueKey = 'value',
-    onChange,
-    gridViewRef,
-    refGridData,
-  } = props;
+  const { defaultValue, value, valueKey = 'value', onChange, gridViewRef, refGridData } = props;
   const [gridData, setGridData] = useListenProps(props.gridData || []);
   const values = useRef(defaultValue || []);
   useEffect(() => {
@@ -399,9 +328,7 @@ const SyncGridView = LingxiForwardRef((props: any, ref) => {
 
   const getValues = () =>
     gridData?.filter((d: Record<string, any>, i: any) =>
-      typeof d === 'object'
-        ? values.current?.includes(d[valueKey])
-        : values.current?.includes(i),
+      typeof d === 'object' ? values.current?.includes(d[valueKey]) : values.current?.includes(i)
     );
   useEffect(() => {
     if (Array.isArray(refGridData)) {
@@ -416,14 +343,14 @@ const SyncGridView = LingxiForwardRef((props: any, ref) => {
       //   setGridData(list || []);
       // }
     }),
-    [gridData],
+    [gridData]
   );
 
   return (
     <MyGrid
       {...props}
       gridData={gridData}
-      onChange={(vals) => {
+      onChange={vals => {
         values.current = vals;
         if (onChange) {
           onChange(vals);

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

@@ -12,13 +12,7 @@ const SyncGridView = LingxiForwardRef<unknown, any>((props, ref) => {
       setGridData(list || []);
     },
   }));
-  return (
-    <SyncGridViewLoader
-      {...props}
-      refGridData={gridData}
-      gridViewRef={gridViewRef}
-    />
-  );
+  return <SyncGridViewLoader {...props} refGridData={gridData} gridViewRef={gridViewRef} />;
 });
 
 export default SyncGridView;

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

@@ -2,10 +2,7 @@ import Loadable from 'react-loadable';
 import { LoadingComponennt } from '../utils/LoaderHelper';
 
 const SyncGridViewLoader = Loadable({
-  loader: async () =>
-    (await import(
-      /* webpackChunkName: "factory-GridView" */ './GridView'
-    )) as unknown as React.ComponentType<any>,
+  loader: async () => (await import(/* webpackChunkName: "factory-GridView" */ './GridView')) as unknown as React.ComponentType<any>,
   loading: LoadingComponennt,
 });
 

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

@@ -1,15 +1,11 @@
 import React from 'react';
 import { useHiddenStyle } from '../utils';
 
-export interface HorizontalViewProps
-  extends React.DetailedHTMLProps<
-    React.HTMLAttributes<HTMLDivElement>,
-    HTMLDivElement
-  > {
+export interface HorizontalViewProps extends React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement> {
   visible?: boolean;
 }
 
-const HorizontalView: React.FC<HorizontalViewProps> = (props) => {
+const HorizontalView: React.FC<HorizontalViewProps> = props => {
   const { children, style, className, visible = true } = props;
 
   const finalStyle = useHiddenStyle(visible, style);
@@ -19,11 +15,7 @@ const HorizontalView: React.FC<HorizontalViewProps> = (props) => {
   // }
   return (
     // @ts-ignore
-    <div
-      style={finalStyle}
-      className={className}
-      data-compid={props?.['data-compid']}
-    >
+    <div style={finalStyle} className={className} data-compid={props?.['data-compid']}>
       {children}
     </div>
   );

package/lib/pcpublic/src/components/pcfactory/src/Icon/IconED/index.tsx

@@ -3,9 +3,8 @@ import { useEffect, useState } from 'react';
 import { useIcon } from '../hooks';
 import type { IconEDProps } from '../PropsType';
 
-const IconED: LingXiEdFC<IconEDProps> = (props) => {
-  const { getMaterialFile, getAppFileUrlById, getAppFileUrlByFileCode } =
-    props?.getEdEngineApi?.() || {};
+const IconED: LingXiEdFC<IconEDProps> = props => {
+  const { getMaterialFile, getAppFileUrlById, getAppFileUrlByFileCode } = props?.getEdEngineApi?.() || {};
   const [fun, setFun] = useState<{
     getFileIconUrl: any;
     getDesignPlatormIconUrl: any;
@@ -24,8 +23,7 @@ const IconED: LingXiEdFC<IconEDProps> = (props) => {
             }),
           getFileIconUrlById: getAppFileUrlById,
         },
-        getDesignPlatormIconUrl: (materialId: string, fileName: string) =>
-          getMaterialFile({ materialId, fileName }),
+        getDesignPlatormIconUrl: (materialId: string, fileName: string) => getMaterialFile({ materialId, fileName }),
       });
     fetchFun();
   }, []);

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

@@ -23,11 +23,7 @@ export const handleIsValidIconCfg = (icon: IconCfg) => {
   }
 
   if (icon?.iconFile && Object.keys(icon.iconFile).length > 0) {
-    if (
-      [ICON_FILE_ICONFONT, ICON_FILE_IMAGE].includes(
-        icon?.iconFile?.fileSubType,
-      )
-    ) {
+    if ([ICON_FILE_ICONFONT, ICON_FILE_IMAGE].includes(icon?.iconFile?.fileSubType)) {
       return true;
     }
     return false;
@@ -84,20 +80,8 @@ const useIcon = (props: UseIconProps) => {
 
   const { getLocale } = useLocale(getEngineApis?.());
 
-  const {
-    type,
-    theme,
-    isIconFont,
-    fontAddress,
-    svgContent,
-    iconFileInfo,
-    iconFile,
-    isUsePrimary,
-    color,
-  } = useMemo(() => {
-    const iconInfo =
-      Array.isArray(iconItems) &&
-      (iconItems.find((c) => c.rule) || iconItems[0]);
+  const { type, theme, isIconFont, fontAddress, svgContent, iconFileInfo, iconFile, isUsePrimary, color } = useMemo(() => {
+    const iconInfo = Array.isArray(iconItems) && (iconItems.find(c => c.rule) || iconItems[0]);
     if (mode === 'custom' && iconInfo && !myIcon?.isAction) {
       return {
         type: iconInfo?.icon?.type,
@@ -121,19 +105,7 @@ const useIcon = (props: UseIconProps) => {
       iconFile: myIcon.iconFile || nIconFile,
       isUsePrimary: nIsUsePrimary,
     };
-  }, [
-    iconItems,
-    mode,
-    JSON.stringify(myIcon),
-    nIconFile,
-    nIconFileInfo,
-    nSvgContent,
-    nFontAddress,
-    nIsIconFont,
-    nTheme,
-    nType,
-    nIsUsePrimary,
-  ]);
+  }, [iconItems, mode, JSON.stringify(myIcon), nIconFile, nIconFileInfo, nSvgContent, nFontAddress, nIsIconFont, nTheme, nType, nIsUsePrimary]);
 
   const renderIcon = () => {
     if (svgContent) {
@@ -163,9 +135,7 @@ const useIcon = (props: UseIconProps) => {
           rotate={rotate}
           {...resProps}
           style={_style}
-          className={`ued-icon ${resProps?.className || ''} ${
-            isUsePrimary ? 'fill-primary' : ''
-          }`}
+          className={`ued-icon ${resProps?.className || ''} ${isUsePrimary ? 'fill-primary' : ''}`}
         />
       );
     }
@@ -173,8 +143,7 @@ const useIcon = (props: UseIconProps) => {
     // 图标来源于 文件资源
     if (iconFile && Object.keys(iconFile).length > 0) {
       const { fileId, fileCode, fileHttp } = iconFile;
-      const { getFileIconUrlByCode, getFileIconUrlById } =
-        getFileIconUrl() || {};
+      const { getFileIconUrlByCode, getFileIconUrlById } = getFileIconUrl() || {};
 
       let iconUrl;
       if (fileId && typeof getFileIconUrlById === 'function') {
@@ -195,15 +164,11 @@ const useIcon = (props: UseIconProps) => {
               {...resProps}
               style={{
                 ...(resProps.style || {}),
-                color: isUsePrimary
-                  ? undefined
-                  : color || resProps.style?.color,
+                color: isUsePrimary ? undefined : color || resProps.style?.color,
                 width: resProps?.style?.fontSize,
                 height: resProps?.style?.fontSize,
               }}
-              className={`ued-icon ${resProps?.className || ''} ${
-                isUsePrimary ? 'fill-primary' : ''
-              }`}
+              className={`ued-icon ${resProps?.className || ''} ${isUsePrimary ? 'fill-primary' : ''}`}
             />
           );
         // 文件是 iconfont.js
@@ -217,9 +182,7 @@ const useIcon = (props: UseIconProps) => {
               rotate={rotate}
               {...resProps}
               style={_style}
-              className={`ued-icon ${resProps?.className || ''} ${
-                isUsePrimary ? 'fill-primary' : ''
-              }`}
+              className={`ued-icon ${resProps?.className || ''} ${isUsePrimary ? 'fill-primary' : ''}`}
             />
           );
         }
@@ -236,10 +199,7 @@ const useIcon = (props: UseIconProps) => {
         return (
           <span
             style={_style}
-            className={classnames(
-              'anticon',
-              `ued-icon ${designPlatformiconCls} ${resProps?.className || ''}`,
-            )}
+            className={classnames('anticon', `ued-icon ${designPlatformiconCls} ${resProps?.className || ''}`)}
             // eslint-disable-next-line react/no-danger
             dangerouslySetInnerHTML={{ __html: svgContent }}
           />
@@ -247,15 +207,7 @@ const useIcon = (props: UseIconProps) => {
       }
       if (materialId && fileName) {
         const iconUrl = getDesignPlatormIconUrl(materialId, fileName);
-        return (
-          <img
-            className={`ued-icon ${designPlatformiconCls} ${
-              resProps?.className || ''
-            }`}
-            src={iconUrl}
-            alt=""
-          />
-        );
+        return <img className={`ued-icon ${designPlatformiconCls} ${resProps?.className || ''}`} src={iconUrl} alt="" />;
       }
       return placeholder;
     }
@@ -263,13 +215,7 @@ const useIcon = (props: UseIconProps) => {
     // 存量存在项目本地的 iconfont 配置数据 ？？
     if (isIconFont) {
       return (
-        <svg
-          style={_style}
-          aria-hidden="true"
-          className={`ued-icon ${resProps?.className || ''} ${
-            isUsePrimary ? 'fill-primary' : ''
-          }`}
-        >
+        <svg style={_style} aria-hidden="true" className={`ued-icon ${resProps?.className || ''} ${isUsePrimary ? 'fill-primary' : ''}`}>
           <use xlinkHref={`#${type}`} />
         </svg>
       );
@@ -284,9 +230,7 @@ const useIcon = (props: UseIconProps) => {
           rotate={rotate}
           {...resProps}
           style={_style}
-          className={`ued-icon ${resProps?.className || ''} ${
-            isUsePrimary ? 'fill-primary' : ''
-          }`}
+          className={`ued-icon ${resProps?.className || ''} ${isUsePrimary ? 'fill-primary' : ''}`}
         />
       );
     }

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

@@ -4,14 +4,7 @@ import { useIcon } from './hooks';
 import type { IconProps } from './PropsType';
 
 const MyIcon = LingxiForwardRef<any, IconProps>((props, ref) => {
-  const {
-    visible = true,
-    engineApis: receivedEngineApis,
-    getEngineApis,
-    $$componentItem,
-    className = '',
-    ...restProps
-  } = props;
+  const { visible = true, engineApis: receivedEngineApis, getEngineApis, $$componentItem, className = '', ...restProps } = props;
 
   const appId = $$componentItem?.appId || props.appId;
 
@@ -37,8 +30,7 @@ const MyIcon = LingxiForwardRef<any, IconProps>((props, ref) => {
 
   const getFileIconUrl = () => {
     return {
-      getFileIconUrlByCode: (fileCode: string) =>
-        engineApis?.service?.getAppFileUrlByFileCode(fileCode, { appId }),
+      getFileIconUrlByCode: (fileCode: string) => engineApis?.service?.getAppFileUrlByFileCode(fileCode, { appId }),
     };
   };
 

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

@@ -5,7 +5,7 @@ interface IconFontProps extends React.HTMLProps<HTMLDivElement> {
   iconClass?: any;
 }
 
-const IconFont: FC<IconFontProps> = (props) => {
+const IconFont: FC<IconFontProps> = props => {
   const { className, style, iconClass, width = 13, height = 13 } = props;
 
   return (

package/lib/pcpublic/src/components/pcfactory/src/Img/BasicImage/index.tsx

@@ -1,15 +1,7 @@
 import { useEffect, useRef, useState } from 'react';
 
 const MyImage = (props: any) => {
-  const {
-    defaultSrc,
-    errorSrc,
-    alt,
-    getContainerStyle,
-    imgDisplay,
-    style,
-    ...restProps
-  } = props;
+  const { defaultSrc, errorSrc, alt, getContainerStyle, imgDisplay, style, ...restProps } = props;
   const imageRef = useRef<HTMLImageElement>(null);
   const [src, setSrc] = useState(props.src);
   const [imgStyle, setImgStyle] = useState({});
@@ -80,9 +72,7 @@ const MyImage = (props: any) => {
           setComplete(true);
         }}
       />
-      {!complete && (
-        <img {...restProps} alt={alt} src={props.defaultSrc} style={myStyle} />
-      )}
+      {!complete && <img {...restProps} alt={alt} src={props.defaultSrc} style={myStyle} />}
     </>
   );
 };

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

@@ -22,17 +22,7 @@ export interface MyImgProps {
 }
 
 const MyImg = React.forwardRef<any, MyImgProps>((props, ref) => {
-  const {
-    visible = true,
-    alt,
-    fileId,
-    src,
-    fileName = '',
-    fileCode,
-    srcType,
-    getEngineApis,
-    ...restProps
-  } = props;
+  const { visible = true, alt, fileId, src, fileName = '', fileCode, srcType, getEngineApis, ...restProps } = props;
 
   const engineApis = getEngineApis?.() || {};
 
@@ -40,29 +30,9 @@ const MyImg = React.forwardRef<any, MyImgProps>((props, ref) => {
   const [errorSrc, setErrorSrc] = useState<string>();
 
   const setImgsrcWithSign = (src: string) => {
-    if (
-      src &&
-      (src.match('downloadFileByFileCode') || src.match('file/download')) &&
-      engineApis?.service?.buildXSignUrl
-    ) {
-      // 如果是平台服务，统一添加或更新签名
-      if (src.match('X-SIGN=')) {
-        // 如果资源地址使用签名模式，需更新地址签名
-        setImgSrc(
-          engineApis.service.buildXSignUrl({
-            url: src.slice(0, src.indexOf('&X-SIGN')),
-            version: (window as any).lxSecurityModeInFile || '1.0',
-          }),
-        );
-      } else {
-        // 添加签名
-        setImgSrc(
-          engineApis.service.buildXSignUrl({
-            url: src,
-            version: (window as any).lxSecurityModeInFile || '1.0',
-          }),
-        );
-      }
+    if (src && (src.match('/downloadFileByFileCode') || src.match('/file/download') || src.match('/file/id/')) && engineApis?.securityWithUrl) {
+      // 如果是平台服务，统一加密加签
+      setImgSrc(engineApis.securityWithUrl(src));
     } else {
       setImgSrc(src);
     }
@@ -91,9 +61,7 @@ const MyImg = React.forwardRef<any, MyImgProps>((props, ref) => {
 
   useEffect(() => {
     if (props.errorSrc) {
-      const tempSrc = engineApis?.service?.getAppFileUrlByFileCode(
-        props.errorSrc,
-      );
+      const tempSrc = engineApis?.service?.getAppFileUrlByFileCode(props.errorSrc);
       setErrorSrc(tempSrc);
     }
   }, [props.errorSrc]);
@@ -110,14 +78,6 @@ const MyImg = React.forwardRef<any, MyImgProps>((props, ref) => {
     },
   }));
 
-  return visible ? (
-    <Img
-      {...restProps}
-      src={imgSrc}
-      alt={alt}
-      errorSrc={errorSrc}
-      defaultSrc={IconPlaceholder}
-    />
-  ) : null;
+  return visible ? <Img {...restProps} src={imgSrc} alt={alt} errorSrc={errorSrc} defaultSrc={IconPlaceholder} /> : null;
 });
 export default MyImg;