@hzab/list-render 1.11.0 → 1.12.1

package/src/table-render/index.jsx

@@ -17,7 +17,7 @@ import { getVal, getFieldList } from "../common/utils";
 import { handleReactions } from "../common/handleReactions";
 
 import { useEditTable, EditableCell } from "../components/Formily/FormilyEditTable";
-import CellEditTable from "../components/CellEditTable"
+import CellEditTable from "@hzab/edit-table"
 import "./index.less";
 
 const scenario = "table-render";
@@ -99,12 +99,131 @@ const TableRender = forwardRef(function (props, tableRef) {
     topProps: props.topProps,
   });
 
+  /** 处理childrn */
+  const handleChildColumns = (childColumns) => {
+    const fieldSchemas = formilyRef.current?.fields;
+    const { Slots = {} } = props;
+    return childColumns?.map((field, colIndex) => {
+      if (!(field.inTable !== false)) return
+
+      const { name, title } = field;
+      const comName = field["x-component"];
+      let _colConf = {};
+      if (props.config?.colConf && props.config?.colConf[field?.name]) {
+        _colConf = props.config?.colConf[field?.name];
+      }
+
+      let colRender = undefined;
+      if (Slots && Slots[field?.name]) {
+        colRender = function (text, record, index) {
+          const Slot = Slots[field?.name];
+          const slotProps = {
+            text,
+            record,
+            index,
+            field: { ...field, ...fieldSchemas?.[field?.name] },
+            fieldSchema: fieldSchemas?.[field?.name],
+          };
+          return <Slot {...slotProps} />;
+        };
+      } else {
+        colRender = function (text, record, index, ...args) {
+          const { width, ellipsis, emptyValue, showTags, showPrefixNode, showMode, enumRenderProps } = _colConf || {};
+          const schemaDefaultValue = fieldSchemas[field?.name]?.componentProps?.emptyValue;
+          const defaultValue = emptyValue ?? schemaDefaultValue ?? tableEmptyValue ?? "";
+
+          let val = getVal({ ...field, ...fieldSchemas[field?.name] }, record, {
+            fieldSchema: fieldSchemas?.[field?.name],
+          });
+
+          if (val === "" || val === undefined || val === null) {
+            val = defaultValue;
+          }
+
+          const content = (
+            <span className="inline-block-max-w" style={{ width }} title={ellipsis?.showTitle ? val : ""}>
+              {val}
+            </span>
+          );
+          if (ellipsis === true || (ellipsis && ellipsis?.showTitle != true)) {
+            return (
+              <Tooltip className="table-cell-ellipsis" {...ellipsis} title={val}>
+                {content}
+              </Tooltip>
+            );
+          }
+
+          if (showMode || showTags || showPrefixNode || (showPrefixNode !== false && comName === "Switch")) {
+            // field 通过 fieldSchemas 获取最新的 field 数据
+            let _showMode = showMode;
+            if (showTags) {
+              _showMode = SHOW_MODE_TYPES.tags;
+            } else if (showPrefixNode) {
+              _showMode = SHOW_MODE_TYPES.prefixNode;
+            }
+
+            return (
+              <EnumRender
+                showMode={_showMode}
+                value={_.get(record, field?.name)}
+                field={{ ...field, ...fieldSchemas?.[field?.name] }}
+                {...enumRenderProps}
+              />
+            );
+          }
+
+          return content;
+        };
+      }
+
+
+      let _title = isFunction(title) ? title() : title;
+      if (_colConf?.title) {
+        _title = isFunction(_colConf?.title) ? _colConf?.title() : _colConf?.title;
+      }
+      const decoratorProps = field["x-decorator-props"] || {};
+      if (decoratorProps.tooltip) {
+        _title = (
+          <span className="col-title-tooltip-wrap inline-block-max-w">
+            {_title}
+            <Tooltip className="col-title-tooltip" title={decoratorProps.tooltip}>
+              <QuestionCircleOutlined className="col-title-tooltip-icon" />
+            </Tooltip>
+          </span>
+        );
+      }
+      const childSelectList = fieldSchemas?.[field?.name]?.dataSource?.map((el) => ({
+        ...el,
+        label: el?.[field?.["x-component-props"]?.["fieldNames"]?.["label"]] || el?.label,
+        value: el?.[field?.["x-component-props"]?.["fieldNames"]?.["value"]] || el?.value,
+      }))
+      return {
+        getField: () => field,
+        editable: true,
+        ..._colConf,
+        onCell: (record, rowIndex, ci) =>
+          _colConf?.onCell?.({ ...record, _field: { ...field, ...(fieldSchemas?.[field?.name] || {}) } }, rowIndex, ci) || {},
+        // 函数式传入，解决 title ReactNode 传入报错问题（table 组件内部对 columns 进行 lodash.deepClone 导致 ReactNode 变成对象无法正常渲染） Uncaught TypeError: this.queryFeedbacks is not a function
+        title: () => _title,
+        key: field?.name,
+        dataIndex: field?.name,
+        type: field["x-validator"] == "number" ? "Number" : comName,
+        validatorList: field["x-validator"] || [],
+        nonEditable: editMode != "cell",
+        values: field?.enum || childSelectList || [],
+        cellProps: field.cellProps,
+        children: handleChildColumns(field?.children),
+        render: getColRender(colRender),
+      }
+
+    })?.filter((el) => (el))
+  }
   useEffect(() => {
     if (!(props.schema && props.schema.properties)) {
       return;
     }
     const fieldList = getFieldList(props.schema, [], { ...props.getFieldListOpt, formilyRef }, isTableSortXIdex);
-    const columns = [];
+    let columns = [];
 
     // 序号列
     if (orderColType === "page") {
@@ -130,123 +249,7 @@ const TableRender = forwardRef(function (props, tableRef) {
       scope: props.schemaScope,
       formilyRef,
     });
-
-    _fieldList.forEach((field, colIndex) => {
-      const fieldSchemas = formilyRef.current?.fields;
-      if (field.inTable !== false) {
-        const { name, title } = field;
-        const comName = field["x-component"];
-
-        let _colConf = {};
-
-        if (props.config?.colConf && props.config?.colConf[name]) {
-          _colConf = props.config?.colConf[name];
-        }
-
-        let colRender = undefined;
-        if (Slots && Slots[name]) {
-          colRender = function (text, record, index) {
-            const Slot = Slots[name];
-            const slotProps = {
-              text,
-              record,
-              index,
-              field: { ...field, ...fieldSchemas?.[name] },
-              fieldSchema: fieldSchemas?.[name],
-            };
-            return <Slot {...slotProps} />;
-          };
-        } else {
-          colRender = function (text, record, index, ...args) {
-            const { width, ellipsis, emptyValue, showTags, showPrefixNode, showMode, enumRenderProps } = _colConf || {};
-            const schemaDefaultValue = fieldSchemas[name]?.componentProps?.emptyValue;
-            const defaultValue = emptyValue ?? schemaDefaultValue ?? tableEmptyValue ?? "";
-
-            let val = getVal({ ...field, ...fieldSchemas[name] }, record, {
-              fieldSchema: fieldSchemas?.[name],
-            });
-
-            if (val === "" || val === undefined || val === null) {
-              val = defaultValue;
-            }
-
-            const content = (
-              <span className="inline-block-max-w" style={{ width }} title={ellipsis?.showTitle ? val : ""}>
-                {val}
-              </span>
-            );
-            if (ellipsis === true || (ellipsis && ellipsis?.showTitle != true)) {
-              return (
-                <Tooltip className="table-cell-ellipsis" {...ellipsis} title={val}>
-                  {content}
-                </Tooltip>
-              );
-            }
-
-            if (showMode || showTags || showPrefixNode || (showPrefixNode !== false && comName === "Switch")) {
-              // field 通过 fieldSchemas 获取最新的 field 数据
-              let _showMode = showMode;
-              if (showTags) {
-                _showMode = SHOW_MODE_TYPES.tags;
-              } else if (showPrefixNode) {
-                _showMode = SHOW_MODE_TYPES.prefixNode;
-              }
-
-              return (
-                <EnumRender
-                  showMode={_showMode}
-                  value={_.get(record, name)}
-                  field={{ ...field, ...fieldSchemas?.[name] }}
-                  {...enumRenderProps}
-                />
-              );
-            }
-
-            return content;
-          };
-        }
-
-        let _title = isFunction(title) ? title() : title;
-        if (_colConf?.title) {
-          _title = isFunction(_colConf?.title) ? _colConf?.title() : _colConf?.title;
-        }
-        const decoratorProps = field["x-decorator-props"] || {};
-        if (decoratorProps.tooltip) {
-          _title = (
-            <span className="col-title-tooltip-wrap inline-block-max-w">
-              {_title}
-              <Tooltip className="col-title-tooltip" title={decoratorProps.tooltip}>
-                <QuestionCircleOutlined className="col-title-tooltip-icon" />
-              </Tooltip>
-            </span>
-          );
-        }
-        const selectList = fieldSchemas?.[name]?.dataSource?.map((el) => ({
-          ...el,
-          label: el?.[field?.["x-component-props"]?.["fieldNames"]?.["label"]] || el?.label,
-          value: el?.[field?.["x-component-props"]?.["fieldNames"]?.["value"]] || el?.value,
-        }))
-
-        columns.push({
-          // field, // HACK: 直接传入 field 在 title 传入 ReactNode，内部深克隆导致页面报错白屏。使用函数获取解决
-          getField: () => field,
-          editable: true,
-          ..._colConf,
-          onCell: (record, rowIndex, ci) =>
-            _colConf?.onCell?.({ ...record, _field: { ...field, ...(fieldSchemas?.[name] || {}) } }, rowIndex, ci) || {},
-          // 函数式传入，解决 title ReactNode 传入报错问题（table 组件内部对 columns 进行 lodash.deepClone 导致 ReactNode 变成对象无法正常渲染） Uncaught TypeError: this.queryFeedbacks is not a function
-          title: () => _title,
-          key: name,
-          dataIndex: name,
-          type: field["x-validator"] == "number" ? "Number" : comName,
-          nonEditable: editMode != "cell",
-          values: field?.enum || selectList || [],
-          cellProps: field.cellProps,
-          children: field?.children,
-          render: getColRender(colRender),
-        });
-      }
-    });
+    columns = columns.concat(handleChildColumns(_fieldList))
 
     if (props.hasAction !== false) {
       const { hasEdit, hasDel, hasDelTips, hasDetail = false } = props.config || {};
@@ -439,6 +442,7 @@ const TableRender = forwardRef(function (props, tableRef) {
         isCellEditTable ? <CellEditTable
           {...tableProps}
           {...cellEditTableProps}
+          {...props}
           onEditSubmit={props?.onEditSubmit}
           Slots={props?.Slots}
           rowSelection={config?.rowSelection}

package/src/components/CellEditTable/Template/ExpandListTemplate/index.less

@@ -1,18 +0,0 @@
-.expandList-template {
-  display: flex;
-  align-items: center;
-
-
-
-  .expandList-template-icon {
-    cursor: pointer;
-  }
-
-  .expandList-template-name {
-    margin-left: 8px;
-  }
-
-  .expandList-template-indent {
-    margin-left: 32px;
-  }
-}

package/src/components/CellEditTable/Template/ExpandListTemplate/index.tsx

@@ -1,92 +0,0 @@
-import { MinusCircleOutlined, MinusSquareOutlined, PlusCircleOutlined } from "@ant-design/icons";
-import { useEffect, useState, memo } from "react";
-import "./index.less";
-export const ExpandListTemplate = (props) => {
-  const [expand, setExpand] = useState<boolean>(false);
-  const { record, item } = props;
-  const { Slots, setExpandKeys, expandKeys }: any = item;
-  const onExpand = (isExpand) => {
-    item?.setNewDataSource((pre) => {
-      const tempPre = [...pre];
-      const childrenIds = props?.record?.children?.map((el) => el?.groupId);
-      if (isExpand) {
-        const findIndex = pre?.findIndex((el) => el?.groupId == props?.record?.groupId);
-        const filterList = pre?.filter((el) => childrenIds?.includes(el?.groupId)) || [];
-        if (filterList?.length == 0) {
-          tempPre.splice(findIndex + 1, 0, ...(props?.record?.children || []));
-        }
-        return [...tempPre];
-      }
-
-      return tempPre?.filter((el) => !childrenIds?.includes(el?.groupId));
-    });
-  };
-  useEffect(() => {
-    if (expandKeys?.includes(props?.record?.groupId)) {
-      setExpand(true);
-      onExpand(true);
-    } else {
-      setExpand(false);
-      onExpand(false);
-    }
-
-    // setExpand(props?.record?.expand);
-  }, [props?.record]);
-
-  const colRender = function (text, record) {
-    const Slot = Slots[item?.columnId];
-    const slotProps = {
-      text,
-      record,
-      // field: { ...field, ...fieldSchemas?.[name] },
-      // fieldSchema: fieldSchemas?.[name],
-    };
-    return <Slot {...slotProps} />;
-  };
-  return (
-    <div className="expandList-template">
-      {props?.record?.children && (
-        <>
-          {!expand ? (
-            <PlusCircleOutlined
-              className="expandList-template-icon"
-              onClick={() => {
-                props.record["expand"] = !expand;
-                setExpandKeys((preExpandKeys) => {
-                  if (preExpandKeys?.includes(props?.record?.groupId)) {
-                    return preExpandKeys?.filter((el) => el != props?.record?.groupId);
-                  }
-                  return [...preExpandKeys, props?.record?.groupId];
-                });
-                setExpand(!expand);
-                onExpand(!expand);
-              }}
-            />
-          ) : (
-            <MinusCircleOutlined
-              className="expandList-template-icon"
-              onClick={() => {
-                props.record["expand"] = !expand;
-                setExpandKeys((preExpandKeys) => {
-                  if (preExpandKeys?.includes(props?.record?.groupId)) {
-                    return preExpandKeys?.filter((el) => el != props?.record?.groupId);
-                  }
-                  return [...preExpandKeys, props?.record?.groupId];
-                });
-                setExpand(!expand);
-                onExpand(!expand);
-              }}
-            />
-          )}
-        </>
-      )}
-
-      <div
-        className={`expandList-template-name ${record?.spiltTag == 0 ? "expandList-template-indent" : ""}`}
-        style={record?.spiltTag == 1 && !record?.children ? { marginLeft: "22px" } : {}}
-      >
-        {Slots?.[item?.columnId] ? colRender("", record) : record[item?.columnId]}
-      </div>
-    </div>
-  );
-};

package/src/components/CellEditTable/Template/NumberCellTemplate.tsx

@@ -1,168 +0,0 @@
-import {
-  Cell,
-  CellTemplate,
-  Compatible,
-  getCellProperty,
-  getCharFromKey,
-  inNumericKey,
-  isAllowedOnNumberTypingKey,
-  isCharAllowedOnNumberInput,
-  isFunctionKey,
-  isNavigationKey,
-  isNumpadNumericKey,
-  keyCodes,
-  Uncertain,
-  UncertainCompatible,
-} from "@silevis/reactgrid";
-import * as React from "react";
-import { parseLocaleNumber } from "./utils";
-
-// NOTE: all modules imported below may be imported from '@silevis/reactgrid'
-
-export interface NumberCell extends Cell {
-  type: "number";
-  value: number;
-  format?: Intl.NumberFormat;
-  validator?: (value: number) => boolean;
-  nanToZero?: boolean;
-  hideZero?: boolean;
-  errorMessage?: string;
-}
-
-export class NumberCellTemplate implements CellTemplate<NumberCell> {
-  private wasEscKeyPressed = false;
-
-  getCompatibleCell(uncertainCell: Uncertain<NumberCell>): Compatible<NumberCell> {
-    let value: number;
-    try {
-      value = getCellProperty(uncertainCell, "value", "number");
-    } catch (error) {
-      value = NaN;
-    }
-    const numberFormat = uncertainCell.format || new Intl.NumberFormat(window.navigator.language);
-    const displayValue = uncertainCell.nanToZero && Number.isNaN(value) ? 0 : value;
-    const text =
-      Number.isNaN(displayValue) || (uncertainCell.hideZero && displayValue === 0)
-        ? ""
-        : numberFormat.format(displayValue);
-    return { ...uncertainCell, value: displayValue, text };
-  }
-
-  handleKeyDown(
-    cell: Compatible<NumberCell>,
-    keyCode: number,
-    ctrl: boolean,
-    shift: boolean,
-    alt: boolean,
-    key: string,
-    capsLock: boolean,
-  ): { cell: Compatible<NumberCell>; enableEditMode: boolean } {
-    if (isNumpadNumericKey(keyCode)) keyCode -= 48;
-    if (isFunctionKey(keyCode)) {
-      if (keyCode === keyCodes.F2) return { cell, enableEditMode: true };
-      return { cell, enableEditMode: false };
-    }
-
-    const char = getCharFromKey(key);
-
-    if (!ctrl && isCharAllowedOnNumberInput(char)) {
-      const value = Number(char);
-
-      if (Number.isNaN(value) && isCharAllowedOnNumberInput(char))
-        return { cell: { ...this.getCompatibleCell({ ...cell, value }), text: char }, enableEditMode: true };
-      return { cell: this.getCompatibleCell({ ...cell, value }), enableEditMode: true };
-    }
-
-    return {
-      cell,
-      enableEditMode: keyCode === keyCodes.POINTER || keyCode === keyCodes.ENTER,
-    };
-  }
-
-  update(cell: Compatible<NumberCell>, cellToMerge: UncertainCompatible<NumberCell>): Compatible<NumberCell> {
-    return this.getCompatibleCell({ ...cell, value: cellToMerge.value });
-  }
-
-  private getTextFromCharCode = (cellText: string): string => {
-    switch (cellText.charCodeAt(0)) {
-      case keyCodes.DASH:
-      case keyCodes.FIREFOX_DASH:
-      case keyCodes.SUBTRACT:
-        return "-";
-      case keyCodes.COMMA:
-        return ",";
-      case keyCodes.PERIOD:
-      case keyCodes.DECIMAL:
-        return ".";
-      default:
-        return cellText;
-    }
-  };
-
-  getClassName(cell: Compatible<NumberCell>, isInEditMode: boolean): string {
-    const isValid = cell.validator?.(cell.value) ?? true;
-    const className = cell.className || "";
-    return `${!isValid ? "rg-invalid" : ""} ${className}`;
-  }
-
-  render(
-    cell: Compatible<NumberCell>,
-    isInEditMode: boolean,
-    onCellChanged: (cell: Compatible<NumberCell>, commit: boolean) => void,
-  ): React.ReactNode {
-    if (!isInEditMode) {
-      const isValid = cell.validator?.(cell.value) ?? true;
-      const textToDisplay = !isValid && cell.errorMessage ? cell.errorMessage : cell.text;
-      return textToDisplay;
-    }
-
-    const locale = cell.format ? cell.format.resolvedOptions().locale : window.navigator.languages[0];
-    const format = new Intl.NumberFormat(locale, { useGrouping: false, maximumFractionDigits: 20 });
-
-    return (
-      <input
-        className="rg-input"
-        inputMode="decimal"
-        ref={(input) => {
-          if (input) {
-            input.focus();
-            input.setSelectionRange(input.value.length, input.value.length);
-          }
-        }}
-        defaultValue={Number.isNaN(cell.value) ? this.getTextFromCharCode(cell.text) : format.format(cell.value)}
-        onChange={(e) =>
-          onCellChanged(this.getCompatibleCell({ ...cell, value: parseLocaleNumber(e.currentTarget.value) }), false)
-        }
-        onBlur={(e) => {
-          onCellChanged(
-            this.getCompatibleCell({ ...cell, value: parseLocaleNumber(e.currentTarget.value) }),
-            !this.wasEscKeyPressed,
-          );
-          this.wasEscKeyPressed = false;
-        }}
-        onKeyDown={(e) => {
-          if (
-            inNumericKey(e.keyCode) ||
-            isNavigationKey(e.keyCode) ||
-            isAllowedOnNumberTypingKey(e.keyCode) ||
-            ((e.ctrlKey || e.metaKey) && e.keyCode === keyCodes.KEY_A)
-          )
-            e.stopPropagation();
-          if (
-            !inNumericKey(e.keyCode) &&
-            !isNavigationKey(e.keyCode) &&
-            !isCharAllowedOnNumberInput(getCharFromKey(e.key))
-          )
-            e.preventDefault();
-          if (e.keyCode === keyCodes.ESCAPE) this.wasEscKeyPressed = true;
-        }}
-        onCopy={(e) => e.stopPropagation()}
-        onCut={(e) => e.stopPropagation()}
-        onPaste={(e) => e.stopPropagation()}
-        onPointerDown={(e) => e.stopPropagation()}
-      />
-    );
-  }
-}
-
-export const NumberTemplate = new NumberCellTemplate();