@lingxiteam/ebe-utils 0.0.27 → 0.0.30

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>

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

@@ -1,3 +1,4 @@
+import { EngineApisType } from '@lingxiteam/types';
 import { useImperativeHandle, useState } from 'react';
 import { createEmptyRow, EMPTY_ROW_TEMP_KEY_ATTR } from '../utils';
 
@@ -18,6 +19,7 @@ interface UseCommonCMDAction {
   setInnerDataSource: Function;
   setOuterDataSource: Function;
   onRowSelected: Function;
+  engineApis?: EngineApisType;
 }
 
 interface UseCMDActionPropsType extends UseCommonCMDAction {
@@ -59,11 +61,15 @@ const useCMDAction = (props: UseCMDActionPropsType) => {
     pagination,
     onRowSaveClick,
     loadPrint,
+    engineApis,
   } = props;
 
   // 表格编辑格式为下拉框时，绑定的服务对应的数据
   const [colServiceDataForEdit, setColServiceDataForEdit] = useState({});
 
+  // 是否只更新内部数据源，从3.8.1开始只更新内部数据源
+  const { tableUpdateInnerDataSource } = engineApis?.compatConfig?.cmd || {};
+
   const { loading, colServiceData } = useCommonCMDAction(props);
 
   const validateFormAndScroll = (compId: string, callback: any = () => {}) => {
@@ -88,14 +94,25 @@ const useCMDAction = (props: UseCMDActionPropsType) => {
      * 加载表格数据（加载完之后，表格就脱离了数据源的控制了）
      */
     setTableData: (data: { dataSource: any[]; total: any; current: any }) => {
-      /**
-       * 注意，不是直接使用 setInnerDataSource
-       * 而是通过 setOuterDataSource 间接驱动 -> setInnerDataSource
-       * 因为需要对数据进行初始化
-       */
-      setOuterDataSource(data?.dataSource || []);
-      setTotal?.(data?.total);
-      setCurrent?.(data?.current);
+      if (tableUpdateInnerDataSource) {
+        setInnerDataSource(data?.dataSource || []);
+      } else {
+        /**
+         * 注意，不是直接使用 setInnerDataSource
+         * 而是通过 setOuterDataSource 间接驱动 -> setInnerDataSource
+         * 因为需要对数据进行初始化
+         */
+        setOuterDataSource(data?.dataSource || []);
+      }
+      const isNumber = (num: any) =>
+        typeof num === 'number' ||
+        (typeof num === 'string' && !isNaN(Number(num)));
+      if (isNumber(data?.total)) {
+        setTotal?.(data?.total);
+      }
+      if (isNumber(data?.current)) {
+        setCurrent?.(data?.current);
+      }
     },
 
     /**
@@ -123,7 +140,20 @@ const useCMDAction = (props: UseCMDActionPropsType) => {
      * 新增一行空白数据（绑定了数据源/没有绑定数据源通用）
      */
     addTableEmptyRow: (updateData: Function, inlineeditnow?: boolean) => {
-      const newRowData = createEmptyRow();
+      const newRowData: any = createEmptyRow();
+      if (tableUpdateInnerDataSource) {
+        const newRowKey = newRowData[EMPTY_ROW_TEMP_KEY_ATTR];
+        newRowData[currentRowKey] = newRowKey;
+        delete newRowData[EMPTY_ROW_TEMP_KEY_ATTR];
+        setInnerDataSource([newRowData, ...innerDataSource]);
+        // 是否开启行编辑
+        if (inlineeditnow) {
+          // 设置当前行为编辑状态
+          setNowEditingData({ ...newRowData });
+          setNowInlineEditKey(newRowKey);
+        }
+        return;
+      }
 
       // TODO: 正是由于这里的历史需求，导致在表格初始化数据里，需要保留处理空白行的逻辑
       // 如果表格绑定了数据源，则添加空白数据行时，采用先在数据源中加入空白行的方式，再刷新该表格数据实现
@@ -178,13 +208,18 @@ const useCMDAction = (props: UseCMDActionPropsType) => {
     },
 
     /**
-     * 新增一行数据（这里新增完后，表格就脱离了数据源的控制了）
+     * 新增一行数据
      */
     addTableRowData: (newRowData: any) => {
+      if (tableUpdateInnerDataSource) {
+        setInnerDataSource([newRowData, ...innerDataSource]);
+        return;
+      }
+
       /**
        * 注意，不是直接使用 setInnerDataSource
        * 而是通过 setOuterDataSource 间接驱动 -> setInnerDataSource
-       * 因为需要对数据进行初始化
+       * 因为需要对数据进行初始化, 表格脱离了数据源的控制了
        */
       setOuterDataSource([newRowData, ...innerDataSource]);
     },
@@ -255,12 +290,16 @@ const useCommonCMDAction = (props: UseCommonCMDAction) => {
     innerDataSource,
     setInnerDataSource,
     setOuterDataSource,
+    engineApis,
   } = props;
 
   const [loading, setLoading] = useState(false);
   // 表格字段翻译绑定的服务对应的翻译数据
   const [colServiceData, setColServiceData] = useState({});
 
+  // 是否只更新内部数据源，从3.8.1开始只更新内部数据源
+  const { tableUpdateInnerDataSource } = engineApis?.compatConfig?.cmd || {};
+
   useImperativeHandle(ref, () => ({
     /**
      * 加载字段翻译数据
@@ -303,7 +342,10 @@ const useCommonCMDAction = (props: UseCommonCMDAction) => {
     },
     clearData: () => {
       setInnerDataSource([]);
-      setOuterDataSource([]);
+      if (!tableUpdateInnerDataSource) {
+        // 3.8.1前，清空表格数据后，会脱离数据源控制
+        setOuterDataSource([]);
+      }
       setTotal?.(0);
       setCurrent?.(1);
       setCurrentPage?.(1);