@lingxiteam/ebe-utils 0.0.25 → 0.0.29

package/lib/node/move.d.ts

@@ -2,5 +2,6 @@ export interface MoveConfig {
     target: string;
     outDir: string;
     cwd?: string;
+    plugin?: any;
 }
 export declare function move(moveConfig: MoveConfig): Promise<any>;

package/lib/node/move.js

@@ -25,7 +25,7 @@ module.exports = __toCommonJS(move_exports);
 var import_fs_extra = require("fs-extra");
 var import_path = require("path");
 var import_getAllImportFiles = require("./babel/getAllImportFiles");
-var copyFileSyncAlias = (cwd, from, to) => {
+var copyFileSyncAlias = (cwd, from, to, plugin) => {
   var _a;
   let context = (0, import_fs_extra.readFileSync)(from, "utf-8");
   const importList = ((_a = context.match(/from '@\/([^']+)'/g)) == null ? void 0 : _a.map((match) => match.slice(8, -1))) || [];
@@ -34,10 +34,13 @@ var copyFileSyncAlias = (cwd, from, to) => {
     const filePath = (0, import_path.relative)((0, import_path.dirname)(from), absolute);
     context = context.replace(`@/${source}`, filePath);
   });
+  if (plugin) {
+    context = plugin(to, context);
+  }
   (0, import_fs_extra.writeFileSync)(to, context, "utf-8");
 };
 async function move(moveConfig) {
-  const { target, outDir, cwd = process.cwd() } = moveConfig;
+  const { target, outDir, cwd = process.cwd(), plugin } = moveConfig;
   const resolvedTarget = (0, import_path.isAbsolute)(target) ? target : (0, import_path.join)(cwd, target);
   if (!(0, import_fs_extra.existsSync)(resolvedTarget)) {
     throw new Error(`指定的入口文件不存在: ${resolvedTarget}`);
@@ -55,7 +58,7 @@ async function move(moveConfig) {
     const filePath = (0, import_path.relative)(cwd, file);
     const absTarget = (0, import_path.isAbsolute)(outDir) ? (0, import_path.join)(outDir, filePath) : (0, import_path.join)(cwd, outDir, filePath);
     (0, import_fs_extra.mkdirpSync)((0, import_path.dirname)(absTarget));
-    copyFileSyncAlias(cwd, file, absTarget);
+    copyFileSyncAlias(cwd, file, absTarget, plugin);
   });
   console.log(`[COPY] 共拷贝文件数 ${count}`);
   const pkg = (0, import_path.join)(cwd, "package.json");

package/lib/pcpublic/src/components/common/PreviewFile/index.tsx

@@ -27,6 +27,7 @@ import security from '@/utils/Security';
 import { LocaleFunction } from '@lingxiteam/types';
 import {
   CAN_SCALE,
+  getPreviewModeWithDate,
   isUrlFormat,
   LOCAL_PREVIEW,
   parseFileInfo,
@@ -324,6 +325,13 @@ const PreviewFile: React.FC<PreviewFileProps> = (props) => {
         }
         return true;
       }
+      // 目前仅支持判断图片类型,当没有文件名的时候通过dataUrl进行判断
+      // @ts-ignore
+      const imgeType = getPreviewModeWithDate(fileBlob?.dataUrl);
+      if (imgeType) {
+        fileInfo.previewMode = imgeType;
+        return true;
+      }
       return false;
     });
     if (target?.previewMode === PREVIEW_MODE.TXT && fileBlob instanceof Blob) {

package/lib/pcpublic/src/components/common/PreviewFile/utils.ts

@@ -84,7 +84,52 @@ export const parseFileInfo = (
   }
   return newFileInfo;
 };
+export const getPreviewModeWithDate = (dataUrl: string) => {
+  if (typeof dataUrl === 'string' && dataUrl.length > 0) {
+    const base64String = dataUrl.split(',')[1];
+    const binaryString = atob(base64String);
+    if (binaryString.length < 4) {
+      return null;
+    }
+    const bytes = new Uint8Array(4);
+
+    // eslint-disable-next-line no-plusplus
+    for (let i = 0; i < 4; i++) {
+      bytes[i] = binaryString.charCodeAt(i);
+    }
 
+    const arr = bytes.subarray(0, 4);
+    let header = '';
+    // eslint-disable-next-line no-plusplus
+    for (let i = 0; i < arr.length; i++) {
+      header += arr[i].toString(16);
+    }
+    // 文件类型匹配
+    let type = null;
+    switch (header) {
+      case '89504e47':
+        type = 'image/png';
+        break;
+      case '47494638':
+        type = 'image/gif';
+        break;
+      case 'ffd8ffe0':
+      case 'ffd8ffe1':
+      case 'ffd8ffe2':
+      case 'ffd8ffe3':
+      case 'ffd8ffe8':
+        type = 'image/jpeg';
+        break;
+      default:
+        break;
+    }
+    if (type?.startsWith('image/')) {
+      return PREVIEW_MODE.IMG;
+    }
+    return null;
+  }
+  return null;
+};
 // 判断是否是网络地址，是的话不调用后端接口预览
 export const isUrlFormat = (id: string) =>
   /^https?:\/\/[^\s/$.?#].[^\s]*$/i.test(id);

package/lib/pcpublic/src/components/pcfactory/package.json

@@ -1,4 +1,4 @@
 {
   "name": "@lingxiteam/pcfactory",
-  "version": "3.7.1"
+  "version": "3.8.1-alpha.12"
 }

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

@@ -1,7 +1,7 @@
 import { LingxiForwardRef } from '@lingxiteam/types';
 import { Collapse } from 'antd';
 import type { CollapsePanelProps } from 'antd/lib/collapse';
-import { useEffect, useRef } from 'react';
+import { useCallback, useEffect, useRef } from 'react';
 import CommIcon from '../Icon';
 import type { PrefixIconIconProps } from '../Icon/PropsType';
 import { useChildRenderContext } from '../utils';
@@ -61,7 +61,7 @@ const CollapsePanel = LingxiForwardRef<any, MyCollapsePanelProps>(
       appId,
       mode: 'engine',
     });
-    const renderHeader = () => {
+    const renderHeader = useCallback(() => {
       const headStyle: { backgroundColor?: string } = {};
       if (headerColor) {
         headStyle.backgroundColor = headerColor;
@@ -146,12 +146,13 @@ const CollapsePanel = LingxiForwardRef<any, MyCollapsePanelProps>(
           </div>
         );
       }
-    };
+    }, [titleColor, header]);
 
     renderRef.current = visible ? (
       <Panel
         {...restProps}
         header={renderHeader()}
+        id={props.$$componentItem.uid}
         key={currentProps?.key ?? currentIndex}
       >
         <div
@@ -172,8 +173,9 @@ const CollapsePanel = LingxiForwardRef<any, MyCollapsePanelProps>(
         props.$$componentItem.uid,
         renderRef,
       );
-    }, [children]);
+    }, []);
 
+    // TODO 暂时通过监听children解决循环列表内子控件未及时更新问题
     useUpdateEffect(() => {
       // 监听需要更新的属性
       childRenderContext.update?.();

package/lib/pcpublic/src/components/pcfactory/src/DynamicDataContainer/YieldMethod.ts

@@ -0,0 +1,33 @@
+class YieldMethod {
+  private cacheMap: {
+    methodName: string;
+    func: (...args: any[]) => any;
+    params?: any[];
+  }[] = [];
+
+  appendTo(methodName: string, func: (...args: any[]) => any, params?: any[]) {
+    this.cacheMap.push({
+      methodName,
+      func,
+      params,
+    });
+  }
+
+  run(method?: string) {
+    let result = null;
+
+    this.cacheMap = this.cacheMap.filter(
+      ({ func, params = [], methodName }) => {
+        if (!method || methodName === method) {
+          result = func?.(...params);
+          return false;
+        }
+        return true;
+      },
+    );
+
+    return result;
+  }
+}
+
+export default YieldMethod;

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

@@ -76,7 +76,13 @@ const DynamicDataContainer = LingxiForwardRef<any, DynamicDataContainerProps>(
     const [pageData, setPageData] = useState<any>();
     const dynamicHelperRef = useRef<ReturnType<typeof dynamicData2DSL>>();
 
-    const { dynamicPageRef, staticAttrKeys } = useDynamicDataContainer({
+    const {
+      dynamicPageRef,
+      staticAttrKeys,
+      yieldMethod,
+      readyComplete,
+      engineliftCycle,
+    } = useDynamicDataContainer({
       dynamicHelper: dynamicHelperRef.current,
     });
 
@@ -216,7 +222,12 @@ const DynamicDataContainer = LingxiForwardRef<any, DynamicDataContainerProps>(
         return undefined;
       },
       setFieldsValue: (assignData: Record<string, unknown>) => {
-        return setFieldsValue(assignData, true);
+        if (readyComplete) {
+          return setFieldsValue(assignData, true);
+        }
+        return yieldMethod.appendTo('setFieldsValue', setFieldsValue, [
+          assignData,
+        ]);
       },
     }));
 
@@ -289,7 +300,11 @@ const DynamicDataContainer = LingxiForwardRef<any, DynamicDataContainerProps>(
               renderDynamicPage(
                 pageData,
                 { uid: $$componentItem.uid },
-                { ref: dynamicPageRef, staticAttrKeys },
+                {
+                  ref: dynamicPageRef,
+                  staticAttrKeys,
+                  engineliftCycle,
+                },
               )}
           </DynamicDataProvider>
         </Spin>

package/lib/pcpublic/src/components/pcfactory/src/DynamicDataContainer/useDynamicDataContainer.ts

@@ -1,4 +1,5 @@
-import { useEffect, useMemo, useRef } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
+import YieldMethod from './YieldMethod';
 
 export const useDynamicDataContainer = ({
   dynamicHelper,
@@ -6,6 +7,8 @@ export const useDynamicDataContainer = ({
   dynamicHelper?: any;
 }) => {
   const dynamicPageRef = useRef<any>(null);
+  const [readyComplete, setReadyComplete] = useState(false);
+  const yieldMethod = useMemo(() => new YieldMethod(), []);
 
   useEffect(() => {
     dynamicHelper?.updateSandboxContext(
@@ -20,8 +23,18 @@ export const useDynamicDataContainer = ({
     return [];
   }, [dynamicHelper]);
 
+  const engineliftCycle = {
+    engineDidRender: () => {
+      setReadyComplete(true);
+      yieldMethod.run();
+    },
+  };
+
   return {
     dynamicPageRef,
     staticAttrKeys,
+    yieldMethod,
+    readyComplete,
+    engineliftCycle,
   };
 };

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

@@ -39,6 +39,35 @@ const MyImg = React.forwardRef<any, MyImgProps>((props, ref) => {
   const [imgSrc, setImgSrc] = useState<string>();
   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',
+          }),
+        );
+      }
+    } else {
+      setImgSrc(src);
+    }
+  };
+
   useEffect(() => {
     // srcType设置兼容存量数据，当存量数据无srcType时根据旧的资源优先级进行赋值
     let mySrcType = srcType;
@@ -52,8 +81,11 @@ const MyImg = React.forwardRef<any, MyImgProps>((props, ref) => {
     }
     if (mySrcType === 'fileCode' && fileCode) {
       setImgSrc(engineApis?.service?.getAppFileUrlByFileCode(fileCode));
+    } else if (/^\d+$/.test(src)) {
+      // 如果src为纯数字，则认为是文件id, 转换成平台文件地址
+      setImgSrc(engineApis?.service?.getAppFileUrlById(src));
     } else {
-      setImgSrc(src);
+      setImgsrcWithSign(src);
     }
   }, [src, fileName, fileId, srcType, fileCode]);
 
@@ -68,7 +100,7 @@ const MyImg = React.forwardRef<any, MyImgProps>((props, ref) => {
 
   useImperativeHandle(ref, () => ({
     setSrc: (href: string) => {
-      setImgSrc(href);
+      setImgsrcWithSign(href);
     },
     setCompFileId: (fileId: string) => {
       setImgSrc(engineApis?.service?.getAppFileUrlById(fileId));

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

@@ -166,6 +166,7 @@ const CheckBox = (item: {
         {renderIcon({ checked, selectImg, normalImg, getAppFileUrlByFileCode })}
       </div>
       <div
+        onClick={() => onChange(item)}
         className={classNames({
           [`${loopListCls}-content`]: true,
           [`${loopListCls}-content-lass`]: isFormCompat,
@@ -323,6 +324,7 @@ const MyGrid = (props: MyLoopList) => {
     gridMode = true, // 存量数据为true
     getEngineApis,
     $$componentItem,
+    className,
     ...restProps
   } = props;
 
@@ -424,7 +426,11 @@ const MyGrid = (props: MyLoopList) => {
   const { MemoLoopItem, renderer, getLoopItemExtraProps } = MemoRenderer;
 
   return (
-    <Row gutter={[vspace, hspace]} style={{ ...backgroundStyle, ...style }}>
+    <Row
+      gutter={[vspace, hspace]}
+      style={{ ...backgroundStyle, ...style }}
+      className={className}
+    >
       {Array.isArray(gridData) &&
         gridData.map((item, index) => {
           const restItem = item || {};
@@ -450,9 +456,8 @@ const MyGrid = (props: MyLoopList) => {
             },
             ...getLoopItemExtraProps?.(item, index),
           };
-
           return (
-            <>
+            <React.Fragment key={gridViewIndex}>
               {!props.disabled ? (
                 <WrapperEditorComp>
                   <EditorComp
@@ -494,7 +499,7 @@ const MyGrid = (props: MyLoopList) => {
                   </DisabledComps>
                 </WrapperDisableComps>
               )}
-            </>
+            </React.Fragment>
           );
         })}
     </Row>

package/lib/pcpublic/src/components/pcfactory/src/ModalSelect/BaseModalSelect.tsx

@@ -64,7 +64,14 @@ const BaseModalSelect = (props: any) => {
             );
           }}
           onClick={(e) => {
-            !disabled && handleClickVisible();
+            if (!disabled) {
+              // 图标点击事件优先级最高，其次才是打开默认属性弹窗
+              if (onIconClick) {
+                onIconClick();
+              } else {
+                handleClickVisible();
+              }
+            }
             e.stopPropagation();
           }}
           style={{

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

@@ -260,29 +260,43 @@ const FormUpload = LingxiForwardRef<any, MyFormUploadProps>((props, ref) => {
         defaultList.map((file: any) => {
           const { fileUrl, url, filePathInServer, fileId } = file;
           let effectDownUrl = fileUrl || url;
+          // 兼容外部数据使用filePathInServer字段
           if (
             !effectDownUrl &&
             filePathInServer?.match(/^(http:|https:|\/\/)/)
           ) {
             effectDownUrl = filePathInServer;
           }
-          if (
-            effectDownUrl &&
-            effectDownUrl.match('X-SIGN=') &&
-            engineApis?.service?.buildXSignUrl
-          ) {
-            // 如果资源地址使用签名模式，需更新地址签名
-            effectDownUrl = engineApis.service.buildXSignUrl(
-              effectDownUrl.slice(0, url.indexOf('&X-SIGN')),
-            );
+
+          // 资源地址签名处理
+          if (effectDownUrl && engineApis.service?.buildXSignUrl) {
+            if (effectDownUrl.match('X-SIGN=')) {
+              // 如果资源地址使用签名模式，需更新地址签名
+              effectDownUrl = engineApis.service.buildXSignUrl({
+                url: effectDownUrl.slice(0, effectDownUrl.indexOf('&X-SIGN')),
+                version: (window as any).lxSecurityModeInFile || '1.0',
+              });
+            } else {
+              // 添加签名
+              effectDownUrl = engineApis.service.buildXSignUrl({
+                url: effectDownUrl,
+                version: (window as any).lxSecurityModeInFile || '1.0',
+              });
+            }
           }
+
+          const finallyUrl =
+            effectDownUrl || engineApis?.service?.getAppFileUrlById(fileId);
+          const finallyUrlWithoutSign = finallyUrl.match('X-SIGN=')
+            ? finallyUrl.slice(0, finallyUrl.indexOf('&X-SIGN'))
+            : finallyUrl;
           return {
             ...file,
-            url:
-              effectDownUrl || engineApis?.service?.getAppFileUrlById(fileId),
+            url: finallyUrl,
             name: file.fileName,
             uid: `-${file.fileId || file.id || effectDownUrl || file.uid}`, // 添加uid
             status: file?.status || 'done', // 后台已存在文件状态为已完成
+            fileUrl: file.fileUrl || finallyUrlWithoutSign, // 补充一个没有签名的url地址, 业务数据里使用的应是不带签名的
           };
         }),
       );
@@ -348,19 +362,26 @@ const FormUpload = LingxiForwardRef<any, MyFormUploadProps>((props, ref) => {
             } = resultObject;
             const { status } = f;
             let effectDownUrl = fileUrl || url;
+            // 兼容外部数据使用filePathInServer字段
             if (
               !effectDownUrl &&
               filePathInServer?.match(/^(http:|https:|\/\/)/)
             ) {
               effectDownUrl = filePathInServer;
             }
+
+            const finallyUrl =
+              effectDownUrl || engineApis?.service?.getAppFileUrlById(fileId);
+            const finallyUrlWithoutSign = finallyUrl.match('X-SIGN=')
+              ? finallyUrl.slice(0, finallyUrl.indexOf('&X-SIGN'))
+              : finallyUrl;
             return {
               ...f,
               ...resultObject,
               name: handleFileName(f.name),
               status: +resultCode !== 0 ? 'error' : status,
-              url:
-                effectDownUrl || engineApis?.service?.getAppFileUrlById(fileId),
+              url: finallyUrl,
+              fileUrl: file.fileUrl || finallyUrlWithoutSign,
             };
           }
         }
@@ -472,6 +493,11 @@ const FormUpload = LingxiForwardRef<any, MyFormUploadProps>((props, ref) => {
           addWaterMark,
           fileId: file.fileId,
         });
+      } else if (engineApis?.service?.buildXSignUrl) {
+        downUrl = engineApis.service.buildXSignUrl({
+          url: downUrl,
+          version: (window as any).lxSecurityModeInFile || '1.0',
+        });
       }
     } catch (error) {
       console.error(error);

package/lib/pcpublic/src/components/pcfactory/src/SuperSelect/ComSelect.tsx

@@ -100,9 +100,9 @@ const ComSelect = forwardRef<any, ComSelectProps>((props) => {
 
   const [reload, setReload] = useState(0);
   const [compValue, setCompValue] = useState<any>();
-  const [dataSource, setDataSource] = useState([]);
-  const [oldDataSource, setOldDataSource] = useState([]);
-  const [selectedRows, setSelectedRows] = useState<any>([]);
+  const [dataSource, setDataSource] = useState<any[]>([]);
+  const [oldDataSource, setOldDataSource] = useState<any[]>([]);
+  const [selectedRows, setSelectedRows] = useState<any[]>([]);
   const [params, setParams] = useState(defaultParams);
   const [total, setTotal] = useState(0);
   const [, setShow] = useState(false);
@@ -240,24 +240,28 @@ const ComSelect = forwardRef<any, ComSelectProps>((props) => {
           },
         })
         .then((res = []) => {
-          res.forEach((item) => {
+          const newList = res.map((l: any) => ({
+            ...l,
+            [valueKey?.key]: String(l[valueKey?.key]),
+          }));
+          newList.forEach((item) => {
             set(item[valueKey?.key], item);
           });
           // 针对选择的数据在对应表中已删除时，手动补齐数据做展示
           const others: any[] = [];
           ids.forEach((i: any) => {
             // eslint-disable-next-line eqeqeq
-            if (!res.find((r) => r[valueKey?.key] == i)) {
+            if (!newList.find((r) => r[valueKey?.key] == i)) {
               others.push({
                 [valueKey?.key]: i,
                 [labelKey?.key || valueKey?.key]: i,
               });
             }
           });
-          setSelectedRows([...res, ...others]);
+          setSelectedRows([...newList, ...others]);
           // 如果初次未传入正确的value数据类型
-          if (res?.length && res[0][valueKey?.key]) {
-            const realType = typeof res[0][valueKey?.key];
+          if (newList?.length && newList[0][valueKey?.key]) {
+            const realType = typeof newList[0][valueKey?.key];
             const valueType = typeof ids[0];
             if (
               (realType !== valueType || ignoreValueType) &&
@@ -269,7 +273,7 @@ const ComSelect = forwardRef<any, ComSelectProps>((props) => {
                   : ids.map((item) => transFormType[realType](item));
               onSelectChange(
                 transformValue,
-                res
+                newList
                   .map((item) => item[labelKey?.key || valueKey?.key])
                   .join(','),
               );
@@ -308,12 +312,16 @@ const ComSelect = forwardRef<any, ComSelectProps>((props) => {
         })
         .then((res: any) => {
           const { list = [], total: newTotal } = res || {};
+          const newList: any[] = list.map((l: any) => ({
+            ...l,
+            [valueKey?.key]: String(l[valueKey?.key]),
+          }));
           if (!isSearch) {
-            setOldDataSource(list);
+            setOldDataSource([...newList]);
             setTotal(newTotal || 0);
           }
-          setDataSource(list);
-          (list || []).forEach((item: any) => {
+          setDataSource([...newList]);
+          (newList || []).forEach((item: any) => {
             if (!get(item[valueKey?.key])) {
               set(item[valueKey?.key], item);
             }
@@ -432,7 +440,7 @@ const ComSelect = forwardRef<any, ComSelectProps>((props) => {
           // onSearch={fetchList}
           onSearch={(v) => superSelectGetAllPage(v, true)}
           onChange={(e) => {
-            let changeValue: string | never[] = [];
+            let changeValue: any[] = [];
             if (labelInValue) {
               changeValue =
                 mode === 'multiple'
@@ -441,7 +449,7 @@ const ComSelect = forwardRef<any, ComSelectProps>((props) => {
             } else {
               changeValue = mode === 'multiple' ? e : [e];
             }
-            const newData = dataSource.filter((f) =>
+            const newData = dataSource.filter((f: any) =>
               changeValue.includes(f[valueKey.key]),
             );
             setSelectedRows(newData);

package/lib/pcpublic/src/components/pcfactory/src/Table/FormatCell/index.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { CSSProperties } from 'react';
 
 import type { FuncExpExeCuteType } from '../../utils/hooks/useFuncExpExecute';
 import {
@@ -42,6 +42,7 @@ export interface CellContentProps {
   children: any;
   contentStyle: ContentStyle;
   funcExpExecute?: FuncExpExeCuteType;
+  controllLineStyle?: CSSProperties | null;
 }
 
 const CellContent = (props: CellContentProps) => {
@@ -54,6 +55,7 @@ const CellContent = (props: CellContentProps) => {
     rowIndex,
     contentStyle,
     funcExpExecute,
+    controllLineStyle,
   } = props;
   const {
     contentType,
@@ -96,6 +98,14 @@ const CellContent = (props: CellContentProps) => {
 
   children = content ? handleCellContent(row, rowIndex) : children;
 
+  if (content && controllLineStyle) {
+    children = (
+      <span className="ued-control-line-number" style={controllLineStyle}>
+        {children}
+      </span>
+    );
+  }
+
   const handleOnCellClick = (e: any) => {
     e.stopPropagation();
     if (typeof onCellClick === 'function') {
@@ -214,6 +224,7 @@ const FormatCell: React.FC<MyFormatCell> = (props) => {
           row={row}
           rowId={rowId}
           rowIndex={rowIndex}
+          controllLineStyle={props.tdProps?.controllLineStyle}
         >
           {children}
         </CellContent>