@lingxiteam/ebe-utils 0.0.10 → 0.0.12

package/lib/pcpublic/src/components/pcfactory/src/RemoteComponent/constant.ts

@@ -2,6 +2,42 @@ 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/pcpublic/src/components/pcfactory/src/RemoteComponent/index.tsx

@@ -1,10 +1,10 @@
 import { LingxiForwardRef } from '@lingxiteam/types';
 import { createRequires } from '@paciolan/remote-component/dist/createRequires';
 import { createUseRemoteComponent } from '@paciolan/remote-component/dist/hooks/useRemoteComponent';
-import { useImperativeHandle, useState } from 'react';
+import { useImperativeHandle, useRef, useState } from 'react';
 import { useListenProps } from '../utils';
 import { useDeepCompareEffect } from '../utils/ahooks';
-import { RemoteComponentMap } from './constant';
+import { mergeGetter, RemoteComponentMap } from './constant';
 
 export const getUseRemoteComponent = (config: any) => {
   const requires = createRequires(() => config.resolve);
@@ -38,20 +38,27 @@ const RemoteComponent = LingxiForwardRef<any, MyRemoteComponentProps>(
     const [remoteUrl, setRemoteUrl] = useState<string>(url || '');
 
     const [customProps, setProps] = useListenProps<any>(myProps);
+    const [myRefs, setMyRefs] = useState<any>();
+    const isDid = useRef(false);
 
-    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],
+    );
     useDeepCompareEffect(() => {
       // 如果是远程服务组件
       if (fileCode && associatedType === 'file') {
@@ -64,7 +71,6 @@ const RemoteComponent = LingxiForwardRef<any, MyRemoteComponentProps>(
     if (!visible) {
       return <></>;
     }
-
     const Component = RemoteComponentMap[type];
 
     return (
@@ -74,6 +80,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/pcpublic/src/components/pcfactory/src/RichTextEditor/RichTextEditor.tsx

@@ -3,9 +3,8 @@ import { LingxiForwardRef } from '@lingxiteam/types';
 import type { FormItemProps } from 'antd/lib/form';
 import classnames from 'classnames';
 import React, { CSSProperties, useMemo } from 'react';
-import { FormFields, getFieldsProps } from '../utils';
+import { filterHtmlNode, FormFields, getFieldsProps } from '../utils';
 import { useLocale } from '../utils/hooks/useLocale';
-import { renderRichText } from '../utils/renderReadOnly';
 
 export interface MyRichTextEditorProps extends FormItemProps {
   visible?: boolean;
@@ -84,7 +83,6 @@ const BaseRichTextEditor = React.forwardRef(
       style,
       richTextRef,
     } = props;
-    engineApis;
 
     const heightStyle = useMemo(
       () =>
@@ -129,7 +127,7 @@ const BaseRichTextEditor = React.forwardRef(
           ref={richTextRef}
           {...richTextProps}
           {...heightStyle}
-          autofocus={!disabled}
+          autofocus={false} // 现场希望不要默认获取焦点
           disabled={disabled}
           value={value ?? ''}
           language={language}
@@ -211,7 +209,16 @@ const RichTextEditor = LingxiForwardRef<any, MyRichTextEditorProps>(
         disabled={disabled as any}
         readOnly={readOnly}
         rules={finalRules}
-        render={renderRichText}
+        render={(val: string) => {
+          const newVal = filterHtmlNode(val);
+          return (
+            <span
+              className="ued-input-readonly"
+              // eslint-disable-next-line react/no-danger
+              dangerouslySetInnerHTML={{ __html: newVal ?? '--' }}
+            />
+          );
+        }}
       >
         <BaseRichTextEditor
           richTextRef={richTextRef}

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

@@ -1,6 +1,6 @@
 import { CheckOutlined } from '@ant-design/icons';
 import { EngineBaseProps } from '@lingxiteam/types';
-import { Empty, Select as AntdSelect, Spin, Tag } from 'antd';
+import { Select as AntdSelect, Tag } from 'antd';
 import type { SelectProps } from 'antd/es/select';
 import classNames from 'classnames';
 import { isEqual } from 'lodash';
@@ -19,9 +19,11 @@ import {
 } from '../utils';
 import { useMemoizedFn } from '../utils/ahooks';
 import CustomModule from '../utils/CustomModule';
+import EmptyComp from '../utils/Empty';
 import { useFuncExpExecute } from '../utils/hooks/useFuncExpExecute';
 import { useLocale } from '../utils/hooks/useLocale';
 import { renderCommonList } from '../utils/renderReadOnly';
+import SpinComp from '../utils/Spin';
 import {
   checkIfSelectedAll,
   CHECK_ALL_VALUE,
@@ -166,8 +168,13 @@ const Select = React.forwardRef<any, MySelectProps>((props, ref) => {
     return _defaultValue;
   }, []);
 
-  const { sandBoxSafeRun, sandBoxLoadModule, onlySyncValue, compatConfig } =
-    getEngineApis() || {};
+  const {
+    sandBoxSafeRun,
+    sandBoxLoadModule,
+    onlySyncValue,
+    compatConfig,
+    dataState,
+  } = getEngineApis() || {};
   const { getLocale, lang } = useLocale(getEngineApis());
   const CHECK_ALL_TEXT = getLocale?.('all', '全选');
   const funcExpExecute = useFuncExpExecute(sandBoxSafeRun, getLocale);
@@ -275,6 +282,34 @@ const Select = React.forwardRef<any, MySelectProps>((props, ref) => {
     );
     setDataSource(newData);
   }, [JSON.stringify(propsDataSource)]);
+
+  const renderEmpty = useMemo(
+    () => (
+      <EmptyComp
+        getLocale={getLocale}
+        dataState={dataState}
+        clsName="pcfactory-empty-small"
+      />
+    ),
+    [dataState],
+  );
+
+  // 远程过滤搜索
+  const onRemoteFilter = async (searchText: string) => {
+    try {
+      if (filterOption) {
+        setSearching(true);
+        // 所配置的动作，如发送请求需‘同步’才能正确展示loading
+        await filterOption(searchText ?? '');
+      }
+    } catch (err) {
+      searchTextRef.current = '';
+      console.log('err', err);
+    } finally {
+      setSearching(false);
+    }
+  };
+
   const filterObject: SelectProps = useMemo(() => {
     if (filter === 'local') {
       return {
@@ -289,24 +324,11 @@ const Select = React.forwardRef<any, MySelectProps>((props, ref) => {
       return {
         defaultActiveFirstOption: false,
         showSearch: true,
-        notFoundContent: searching ? <Spin size="small" /> : <Empty />,
         filterOption: false,
         onKeyDown: (e) => {
           // 兼容旧浏览器使用keyCode
           if (e.key === 'Enter' || e.keyCode === 13) {
-            try {
-              setSearching(true);
-              if (filterOption) {
-                // filterOption(searchText);
-                filterOption(searchTextRef?.current || '');
-              }
-              setSearching(false);
-            } catch (err) {
-              setSearching(false);
-              // setSearchText('');
-              searchTextRef.current = '';
-              console.log('err', err);
-            }
+            onRemoteFilter(searchTextRef?.current || '');
           }
         },
         onSearch: (input) => {
@@ -320,7 +342,7 @@ const Select = React.forwardRef<any, MySelectProps>((props, ref) => {
             // 下拉单选，失去焦点的时候，会触发，多选不触发，导致下拉单选在失去焦点时，会多触发一次，所以input?.length > 0 判断下
             if (filterOption && isInputSearch === true) {
               // filterOption(searchText);
-              filterOption(input);
+              onRemoteFilter(input);
             }
           } catch (err) {
             // setSearchText('');
@@ -331,7 +353,7 @@ const Select = React.forwardRef<any, MySelectProps>((props, ref) => {
       };
     }
     return {};
-  }, [filter]);
+  }, [filter, dataState]);
 
   const renderLabel = (c: any, index: number) => {
     if (
@@ -494,9 +516,7 @@ const Select = React.forwardRef<any, MySelectProps>((props, ref) => {
   const resetRemoteFilter = () => {
     // 当选中后，需要重新调用远程过滤
     if (filter === 'remote') {
-      if (filterOption) {
-        filterOption('');
-      }
+      onRemoteFilter('');
     }
   };
 
@@ -560,6 +580,9 @@ const Select = React.forwardRef<any, MySelectProps>((props, ref) => {
         open={open}
         mode={mode}
         optionLabelProp="label"
+        notFoundContent={
+          searching ? <SpinComp dataState={dataState} /> : renderEmpty
+        }
         onChange={(v) => {
           if (filter === 'local' && searchTextRef.current) {
             // 点击时需要重置过滤条件
@@ -602,23 +625,26 @@ const Select = React.forwardRef<any, MySelectProps>((props, ref) => {
         }}
       >
         {renderCheckAll()}
-        {(dataSource || []).map((c: any, index: number) => {
-          return (
-            <AntdSelect.Option
-              label={renderLabel(c, index)}
-              title={c.label}
-              key={c.value || Math.random()}
-              value={transformValueType(c.value, value ?? [])}
-              disabled={
-                rangeLimit &&
-                rangeLimit.length > 0 &&
-                !rangeLimit.includes(+c.value)
-              }
-            >
-              {renderOption(c, index)}
-            </AntdSelect.Option>
-          );
-        })}
+        {/* 远程过滤searching时展示notFoundContent内的loading */}
+        {searching
+          ? []
+          : (dataSource || []).map((c: any, index: number) => {
+              return (
+                <AntdSelect.Option
+                  label={renderLabel(c, index)}
+                  title={c.label}
+                  key={c.value || Math.random()}
+                  value={transformValueType(c.value, value ?? [])}
+                  disabled={
+                    rangeLimit &&
+                    rangeLimit.length > 0 &&
+                    !rangeLimit.includes(+c.value)
+                  }
+                >
+                  {renderOption(c, index)}
+                </AntdSelect.Option>
+              );
+            })}
       </AntdSelect>
     </FormFields>
   );

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

@@ -266,6 +266,16 @@ const FormUpload = LingxiForwardRef<any, MyFormUploadProps>((props, ref) => {
           ) {
             effectDownUrl = filePathInServer;
           }
+          if (
+            effectDownUrl &&
+            effectDownUrl.match('X-SIGN=') &&
+            engineApis?.service?.buildXSignUrl
+          ) {
+            // 如果资源地址使用签名模式，需更新地址签名
+            effectDownUrl = engineApis.service.buildXSignUrl(
+              effectDownUrl.slice(0, url.indexOf('&X-SIGN')),
+            );
+          }
           return {
             ...file,
             url:
@@ -458,7 +468,7 @@ const FormUpload = LingxiForwardRef<any, MyFormUploadProps>((props, ref) => {
         const addWaterMark =
           isWatermark && (!optionalFile || downloadWay === '2');
 
-        downUrl = engineApis?.service?.getAppFileUrlById({
+        downUrl = await engineApis?.service?.getAppFileUrlById({
           addWaterMark,
           fileId: file.fileId,
         });

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

@@ -245,7 +245,7 @@ const ComSelect = forwardRef<any, ComSelectProps>((props) => {
           });
           // 针对选择的数据在对应表中已删除时，手动补齐数据做展示
           const others: any[] = [];
-          ids.map((i: any) => {
+          ids.forEach((i: any) => {
             // eslint-disable-next-line eqeqeq
             if (!res.find((r) => r[valueKey?.key] == i)) {
               others.push({
@@ -253,7 +253,6 @@ const ComSelect = forwardRef<any, ComSelectProps>((props) => {
                 [labelKey?.key || valueKey?.key]: i,
               });
             }
-            return i;
           });
           setSelectedRows([...res, ...others]);
           // 如果初次未传入正确的value数据类型

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

@@ -16,9 +16,14 @@ export interface SummaryRowProps<T> {
    * 默认总结行
    */
   summary?: TableProps<T>['summary'];
+
+  /**
+   * 选择模式
+   */
+  selectionType?: Required<TableProps<T>>['rowSelection']['type'];
 }
 const TableSummaryRow = <T,>(props: SummaryRowProps<T>) => {
-  const { dataSource, columns, summaryConfig, summary } = props;
+  const { dataSource, columns, summaryConfig, summary, selectionType } = props;
   const { background } = summaryConfig || {};
   const { summaryColList } = useSummaryCol({
     dataSource,
@@ -32,6 +37,8 @@ const TableSummaryRow = <T,>(props: SummaryRowProps<T>) => {
         background,
       }}
     >
+      {/* 开启选择模式时，预置一个占位单元格 */}
+      {selectionType !== undefined && <Cell index={0} />}
       {summaryColList.map(({ colSpan, title, align }, i) => (
         <Cell index={i} colSpan={colSpan || 1} align={align}>
           {title}

package/lib/pcpublic/src/components/pcfactory/src/Table/hooks/useCMDActions.ts

@@ -139,7 +139,7 @@ const useCMDAction = (props: UseCMDActionPropsType) => {
           name: dataName,
           patch: undefined,
           operateType: 0,
-          itemIndex: {},
+          itemIndex: 0,
           newData: {},
           payload,
         };
@@ -154,7 +154,7 @@ const useCMDAction = (props: UseCMDActionPropsType) => {
               name: dataName,
               patch: undefined,
               operateType: 0,
-              itemIndex: {},
+              itemIndex: 0,
               newData: {},
               payload,
             },
@@ -166,7 +166,7 @@ const useCMDAction = (props: UseCMDActionPropsType) => {
         updateData(params);
       } else {
         // 注意，不是直接使用 setInnerDataSource，而是通过 setOuterDataSource 间接驱动 -> setInnerDataSource
-        setOuterDataSource([...innerDataSource, newRowData]);
+        setOuterDataSource([newRowData, ...innerDataSource]);
       }
 
       // 是否开启行编辑
@@ -186,7 +186,7 @@ const useCMDAction = (props: UseCMDActionPropsType) => {
        * 而是通过 setOuterDataSource 间接驱动 -> setInnerDataSource
        * 因为需要对数据进行初始化
        */
-      setOuterDataSource([...innerDataSource, newRowData]);
+      setOuterDataSource([newRowData, ...innerDataSource]);
     },
 
     /**