@ant-design/pro-components 2.8.10 → 3.0.0-beta.1

package/es/table/utils/columnRender.d.ts

@@ -0,0 +1,41 @@
+import { AnyObject } from 'antd/lib/_util/type';
+import React from 'react';
+import type { ProFieldEmptyText } from '../../field';
+import type { ProSchemaComponentTypes, UseEditableUtilType } from '../../utils';
+import type { ContainerType } from '../Store/Provide';
+import type { ProColumns } from '../typing';
+/** 转化列的定义 */
+type ColumnRenderInterface<T> = {
+    columnProps: ProColumns<T>;
+    text: any;
+    rowData: T;
+    index: number;
+    columnEmptyText?: ProFieldEmptyText;
+    type: ProSchemaComponentTypes;
+    counter: ReturnType<ContainerType>;
+    editableUtils: UseEditableUtilType;
+    subName: string[];
+    marginSM?: number;
+};
+/**
+ * 增加了 icon 的功能 render title
+ *
+ * @param item
+ */
+export declare const renderColumnsTitle: (item: ProColumns<any>) => string | number | boolean | Iterable<React.ReactNode> | import("react/jsx-runtime").JSX.Element | null | undefined;
+/**
+ * 默认的 filter 方法
+ *
+ * @param value
+ * @param record
+ * @param dataIndex
+ * @returns
+ */
+export declare const defaultOnFilter: (value: string, record: any, dataIndex: string | string[]) => boolean;
+/**
+ * 这个组件负责单元格的具体渲染
+ *
+ * @param param0
+ */
+export declare function columnRender<T extends AnyObject>({ columnProps, text, rowData, index, columnEmptyText, counter, type, subName, marginSM, editableUtils, }: ColumnRenderInterface<T>): any;
+export {};

package/es/table/utils/columnRender.js

@@ -0,0 +1,147 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+
+// src/table/utils/columnRender.tsx
+import get from "rc-util/lib/utils/get";
+import React from "react";
+import { isMergeCell } from ".";
+import { LabelIconTip, genCopyable, isNil } from "../../utils";
+import cellRenderToFromItem from "./cellRenderToFromItem";
+var renderColumnsTitle = (item) => {
+  var _a;
+  const { title } = item;
+  const ellipsis = typeof (item == null ? void 0 : item.ellipsis) === "boolean" ? item == null ? void 0 : item.ellipsis : (_a = item == null ? void 0 : item.ellipsis) == null ? void 0 : _a.showTitle;
+  if (title && typeof title === "function") {
+    return title(
+      item,
+      "table",
+      /* @__PURE__ */ React.createElement(LabelIconTip, { label: null, tooltip: item.tooltip })
+    );
+  }
+  return /* @__PURE__ */ React.createElement(LabelIconTip, { label: title, tooltip: item.tooltip, ellipsis });
+};
+function isNotEditableCell(text, rowData, index, editable) {
+  if (typeof editable === "boolean") {
+    return editable === false;
+  }
+  return (editable == null ? void 0 : editable(text, rowData, index)) === false;
+}
+var defaultOnFilter = (value, record, dataIndex) => {
+  const recordElement = Array.isArray(dataIndex) ? get(record, dataIndex) : record[dataIndex];
+  const itemValue = String(recordElement);
+  return String(itemValue) === String(value);
+};
+function columnRender({
+  columnProps,
+  text,
+  rowData,
+  index,
+  columnEmptyText,
+  counter,
+  type,
+  subName,
+  marginSM,
+  editableUtils
+}) {
+  const { action, prefixName } = counter;
+  const { isEditable, recordKey } = editableUtils.isEditable(__spreadProps(__spreadValues({}, rowData), {
+    index
+  }));
+  const { renderText = (val) => val } = columnProps;
+  const renderTextStr = renderText(text, rowData, index, action);
+  const mode = isEditable && !isNotEditableCell(text, rowData, index, columnProps == null ? void 0 : columnProps.editable) ? "edit" : "read";
+  const textDom = cellRenderToFromItem({
+    text: renderTextStr,
+    valueType: columnProps.valueType || "text",
+    index,
+    rowData,
+    subName,
+    columnProps: __spreadProps(__spreadValues({}, columnProps), {
+      // 为了兼容性，原来写了个错别字
+      // @ts-ignore
+      entry: rowData,
+      entity: rowData
+    }),
+    counter,
+    columnEmptyText,
+    type,
+    recordKey,
+    mode,
+    prefixName,
+    editableUtils
+  });
+  const dom = mode === "edit" ? textDom : genCopyable(textDom, columnProps, renderTextStr);
+  if (mode === "edit") {
+    if (columnProps.valueType === "option") {
+      return /* @__PURE__ */ React.createElement(
+        "div",
+        {
+          style: {
+            display: "flex",
+            alignItems: "center",
+            gap: marginSM,
+            justifyContent: columnProps.align === "center" ? "center" : "flex-start"
+          }
+        },
+        editableUtils.actionRender(__spreadProps(__spreadValues({}, rowData), {
+          index: columnProps.index || index
+        }))
+      );
+    }
+    return dom;
+  }
+  if (!columnProps.render) {
+    const isReactRenderNode = React.isValidElement(dom) || ["string", "number"].includes(typeof dom);
+    return !isNil(dom) && isReactRenderNode ? dom : null;
+  }
+  const renderDom = columnProps.render(
+    dom,
+    rowData,
+    index,
+    __spreadValues(__spreadValues({}, action), editableUtils),
+    __spreadProps(__spreadValues({}, columnProps), {
+      isEditable,
+      type: "table"
+    })
+  );
+  if (isMergeCell(renderDom)) {
+    return renderDom;
+  }
+  if (renderDom && columnProps.valueType === "option" && Array.isArray(renderDom)) {
+    return /* @__PURE__ */ React.createElement(
+      "div",
+      {
+        style: {
+          display: "flex",
+          alignItems: "center",
+          justifyContent: "flex-start",
+          gap: 8
+        }
+      },
+      renderDom
+    );
+  }
+  return renderDom;
+}
+export {
+  columnRender,
+  defaultOnFilter,
+  renderColumnsTitle
+};

package/es/table/utils/columnSort.d.ts

@@ -0,0 +1,2 @@
+import type { ColumnsState } from '../Store/Provide';
+export declare const columnSort: (columnsMap: Record<string, ColumnsState>) => (a: any, b: any) => number;

package/es/table/utils/columnSort.js

@@ -0,0 +1,21 @@
+// src/table/utils/columnSort.ts
+var columnSort = (columnsMap) => (a, b) => {
+  var _a, _b, _c, _d;
+  const { fixed: aFixed, index: aIndex } = a;
+  const { fixed: bFixed, index: bIndex } = b;
+  if (aFixed === "left" && bFixed !== "left" || bFixed === "right" && aFixed !== "right") {
+    return -2;
+  }
+  if (bFixed === "left" && aFixed !== "left" || aFixed === "right" && bFixed !== "right") {
+    return 2;
+  }
+  const aKey = a.key || `${aIndex}`;
+  const bKey = b.key || `${bIndex}`;
+  if (((_a = columnsMap[aKey]) == null ? void 0 : _a.order) || ((_b = columnsMap[bKey]) == null ? void 0 : _b.order)) {
+    return (((_c = columnsMap[aKey]) == null ? void 0 : _c.order) || 0) - (((_d = columnsMap[bKey]) == null ? void 0 : _d.order) || 0);
+  }
+  return (a.index || 0) - (b.index || 0);
+};
+export {
+  columnSort
+};

package/es/table/utils/genProColumnToColumn.d.ts

@@ -0,0 +1,30 @@
+import type { TableColumnType, TableProps } from 'antd';
+import { AnyObject } from 'antd/lib/_util/type';
+import { SortOrder } from 'antd/lib/table/interface';
+import type { ProFieldEmptyText } from '../../field';
+import type { ProSchemaComponentTypes, UseEditableUtilType } from '../../utils';
+import type { ContainerType } from '../Store/Provide';
+import type { ProColumns } from '../typing';
+type ColumnToColumnReturnType<T> = (TableColumnType<T> & {
+    index?: number;
+})[];
+type ColumnToColumnParams<T> = {
+    columns: ProColumns<T, any>[];
+    counter: ReturnType<ContainerType>;
+    columnEmptyText: ProFieldEmptyText;
+    type: ProSchemaComponentTypes;
+    editableUtils: UseEditableUtilType;
+    proFilter: Record<string, (string | number)[] | null>;
+    proSort: Record<string, SortOrder>;
+} & Pick<TableProps<T>, 'rowKey' | 'childrenColumnName'>;
+/**
+ * 转化 columns 到 pro 的格式 主要是 render 方法的自行实现
+ *
+ * @param columns
+ * @param map
+ * @param columnEmptyText
+ */
+export declare function genProColumnToColumn<T extends AnyObject>(params: ColumnToColumnParams<T> & {
+    marginSM: number;
+}, parents?: ProColumns<T, any>): ColumnToColumnReturnType<T>;
+export {};

package/es/table/utils/genProColumnToColumn.js

@@ -0,0 +1,157 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+
+// src/table/utils/genProColumnToColumn.tsx
+import { Table } from "antd";
+import { proFieldParsingValueEnumToArray } from "../../field";
+import {
+  omitBoolean,
+  omitUndefinedAndEmptyArr,
+  runFunction
+} from "../../utils";
+import {
+  columnRender,
+  defaultOnFilter,
+  renderColumnsTitle
+} from "./columnRender";
+import { genColumnKey } from "./index";
+function genProColumnToColumn(params, parents) {
+  var _a;
+  const {
+    columns,
+    counter,
+    columnEmptyText,
+    type,
+    editableUtils,
+    marginSM,
+    rowKey = "id",
+    childrenColumnName = "children",
+    proFilter = {},
+    proSort
+  } = params;
+  const subNameRecord = /* @__PURE__ */ new Map();
+  return (_a = columns == null ? void 0 : columns.map((columnProps, columnsIndex) => {
+    if (columnProps === Table.EXPAND_COLUMN)
+      return columnProps;
+    if (columnProps === Table.SELECTION_COLUMN)
+      return columnProps;
+    const {
+      key,
+      dataIndex,
+      valueEnum,
+      valueType = "text",
+      children,
+      onFilter,
+      filters = [],
+      sorter,
+      filteredValue: columnFilteredValue
+    } = columnProps;
+    const columnKey = genColumnKey(
+      key || (dataIndex == null ? void 0 : dataIndex.toString()),
+      [parents == null ? void 0 : parents.key, columnsIndex].filter(Boolean).join("-")
+    );
+    const noNeedPro = !valueEnum && !valueType && !children;
+    if (noNeedPro) {
+      return __spreadValues({
+        index: columnsIndex
+      }, columnProps);
+    }
+    const config = counter.columnsMap[columnKey] || {
+      fixed: columnProps.fixed
+    };
+    const genOnFilter = () => {
+      if (onFilter === true) {
+        return (value, row) => defaultOnFilter(value, row, dataIndex);
+      }
+      return omitBoolean(onFilter);
+    };
+    const filteredValue = columnKey && (proFilter == null ? void 0 : proFilter[columnKey]) !== void 0 ? proFilter == null ? void 0 : proFilter[columnKey] : null;
+    const sortOrder = columnKey && proSort[columnKey] !== void 0 ? proSort[columnKey] : null;
+    let keyName = rowKey;
+    const tempColumns = __spreadProps(__spreadValues({
+      index: columnsIndex,
+      key: columnKey
+    }, columnProps), {
+      title: renderColumnsTitle(columnProps),
+      valueEnum,
+      filters: filters === true ? proFieldParsingValueEnumToArray(
+        runFunction(valueEnum, void 0)
+      ).filter((valueItem) => valueItem && valueItem.value !== "all") : filters,
+      onFilter: genOnFilter(),
+      filteredValue: (
+        // 优先使用用户明确设置的 filteredValue
+        columnFilteredValue !== void 0 ? columnFilteredValue : (
+          // 否则，只有在服务端筛选时才使用计算的 filteredValue
+          filters && genOnFilter() == null && filteredValue !== null ? filteredValue : void 0
+        )
+      ),
+      sortOrder: sorter === true ? sortOrder : void 0,
+      fixed: config.fixed,
+      width: columnProps.width || (columnProps.fixed ? 200 : void 0),
+      children: columnProps.children ? genProColumnToColumn(
+        __spreadProps(__spreadValues({}, params), {
+          columns: (columnProps == null ? void 0 : columnProps.children) || []
+        }),
+        __spreadProps(__spreadValues({}, columnProps), { key: columnKey })
+      ) : void 0,
+      render: (text, rowData, index) => {
+        var _a2;
+        if (typeof rowKey === "function") {
+          keyName = rowKey(rowData, index);
+        }
+        let uniqueKey;
+        if (typeof rowData === "object" && rowData !== null && Reflect.has(rowData, keyName)) {
+          uniqueKey = rowData[keyName];
+          const parentInfo = subNameRecord.get(uniqueKey) || [];
+          (_a2 = rowData[childrenColumnName]) == null ? void 0 : _a2.forEach(
+            (item) => {
+              const itemUniqueKey = item[keyName];
+              if (!subNameRecord.has(itemUniqueKey)) {
+                subNameRecord.set(
+                  itemUniqueKey,
+                  parentInfo.concat([index, childrenColumnName])
+                );
+              }
+            }
+          );
+        }
+        const renderProps = {
+          columnProps,
+          text,
+          rowData,
+          index,
+          columnEmptyText,
+          counter,
+          type,
+          marginSM,
+          subName: subNameRecord.get(uniqueKey),
+          editableUtils
+        };
+        return columnRender(renderProps);
+      }
+    });
+    return omitUndefinedAndEmptyArr(tempColumns);
+  })) == null ? void 0 : _a.filter(
+    (item) => !item.hideInTable
+  );
+}
+export {
+  genProColumnToColumn
+};

package/es/table/utils/index.d.ts

@@ -0,0 +1,64 @@
+import type { TablePaginationConfig } from 'antd';
+import type { SortOrder } from 'antd/lib/table/interface';
+import type React from 'react';
+import { Key } from 'react';
+import type { IntlType } from '../../provider';
+import type { UseEditableUtilType } from '../../utils';
+import type { ActionType, Bordered, BorderedType, ProColumns, UseFetchDataAction } from '../typing';
+/**
+ * 检查值是否存在 为了 避开 0 和 false
+ *
+ * @param value
+ */
+export declare const checkUndefinedOrNull: (value: any) => boolean;
+/**
+ * 合并用户 props 和 预设的 props
+ *
+ * @param pagination
+ * @param action
+ * @param intl
+ */
+export declare function mergePagination<T>(pagination: TablePaginationConfig | boolean | undefined, pageInfo: UseFetchDataAction<T>['pageInfo'] & {
+    setPageInfo: any;
+}, intl: IntlType): TablePaginationConfig | false | undefined;
+/**
+ * 获取用户的 action 信息
+ *
+ * @param actionRef
+ * @param counter
+ * @param onCleanSelected
+ */
+export declare function useActionType<T>(ref: React.MutableRefObject<ActionType | undefined>, action: UseFetchDataAction<T>, props: {
+    fullScreen: () => void;
+    onCleanSelected: () => void;
+    resetAll: () => void;
+    editableUtils: UseEditableUtilType;
+}): void;
+type PostDataType<T> = (data: T) => T;
+/**
+ * 一个转化的 pipeline 列表
+ *
+ * @param data
+ * @param pipeline
+ */
+export declare function postDataPipeline<T>(data: T, pipeline: PostDataType<T>[]): T;
+export declare const isBordered: (borderType: BorderedType, border?: Bordered) => boolean | undefined;
+export declare const isMergeCell: (dom: any) => any;
+/**
+ * 根据 key 和 dataIndex 生成唯一 id
+ *
+ * @param key 用户设置的 key
+ * @param dataIndex 在对象中的数据
+ * @param index 序列号，理论上唯一
+ */
+export declare const genColumnKey: (key?: string | number | Key, index?: number | string) => string;
+/**
+ * 从 ProColumns 数组中取出默认的排序和筛选数据
+ *
+ * @param columns ProColumns
+ */
+export declare function parseDefaultColumnConfig<T, Value>(columns: ProColumns<T, Value>[]): {
+    sort: Record<string, SortOrder>;
+    filter: Record<string, (string | number)[] | null>;
+};
+export {};

package/es/table/utils/index.js

@@ -0,0 +1,160 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+
+// src/table/utils/index.ts
+var checkUndefinedOrNull = (value) => value !== void 0 && value !== null;
+function mergePagination(pagination, pageInfo, intl) {
+  var _a, _b;
+  if (pagination === false) {
+    return false;
+  }
+  const { total, current, pageSize, setPageInfo } = pageInfo;
+  const defaultPagination = typeof pagination === "object" ? pagination : {};
+  return __spreadProps(__spreadValues({
+    showTotal: (all, range) => `${intl.getMessage("pagination.total.range", "第")} ${range[0]}-${range[1]} ${intl.getMessage(
+      "pagination.total.total",
+      "条/总共"
+    )} ${all} ${intl.getMessage("pagination.total.item", "条")}`,
+    total
+  }, defaultPagination), {
+    current: pagination !== true && pagination ? (_a = pagination.current) != null ? _a : current : current,
+    pageSize: pagination !== true && pagination ? (_b = pagination.pageSize) != null ? _b : pageSize : pageSize,
+    onChange: (page, newPageSize) => {
+      const { onChange } = pagination;
+      onChange == null ? void 0 : onChange(page, newPageSize || 20);
+      if (newPageSize !== pageSize || current !== page) {
+        setPageInfo({ pageSize: newPageSize, current: page });
+      }
+    }
+  });
+}
+function useActionType(ref, action, props) {
+  const userAction = __spreadProps(__spreadValues({}, props.editableUtils), {
+    pageInfo: action.pageInfo,
+    reload: (resetPageIndex) => __async(this, null, function* () {
+      if (resetPageIndex) {
+        yield action.setPageInfo({
+          current: 1
+        });
+      }
+      yield action == null ? void 0 : action.reload();
+    }),
+    reloadAndRest: () => __async(this, null, function* () {
+      props.onCleanSelected();
+      yield action.setPageInfo({
+        current: 1
+      });
+      yield action == null ? void 0 : action.reload();
+    }),
+    reset: () => __async(this, null, function* () {
+      var _a;
+      yield props.resetAll();
+      yield (_a = action == null ? void 0 : action.reset) == null ? void 0 : _a.call(action);
+      yield action == null ? void 0 : action.reload();
+    }),
+    fullScreen: () => props.fullScreen(),
+    clearSelected: () => props.onCleanSelected(),
+    setPageInfo: (rest) => action.setPageInfo(rest)
+  });
+  ref.current = userAction;
+}
+function postDataPipeline(data, pipeline) {
+  if (pipeline.filter((item) => item).length < 1) {
+    return data;
+  }
+  return pipeline.reduce((pre, postData) => {
+    return postData(pre);
+  }, data);
+}
+var isBordered = (borderType, border) => {
+  if (border === void 0) {
+    return false;
+  }
+  if (typeof border === "boolean") {
+    return border;
+  }
+  return border[borderType];
+};
+var isMergeCell = (dom) => {
+  var _a;
+  return dom && typeof dom === "object" && ((_a = dom == null ? void 0 : dom.props) == null ? void 0 : _a.colSpan);
+};
+var genColumnKey = (key, index) => {
+  if (key) {
+    return Array.isArray(key) ? key.join("-") : key.toString();
+  }
+  return `${index}`;
+};
+function parseDataIndex(dataIndex) {
+  if (Array.isArray(dataIndex)) {
+    return dataIndex.join(",");
+  }
+  return dataIndex == null ? void 0 : dataIndex.toString();
+}
+function parseDefaultColumnConfig(columns) {
+  const filter = {};
+  const sort = {};
+  columns.forEach((column) => {
+    const dataIndex = parseDataIndex(column.dataIndex);
+    if (!dataIndex) {
+      return;
+    }
+    if (column.filters) {
+      const defaultFilteredValue = column.defaultFilteredValue;
+      if (defaultFilteredValue !== void 0) {
+        filter[dataIndex] = column.defaultFilteredValue;
+      }
+    }
+    if (column.sorter && column.defaultSortOrder) {
+      sort[dataIndex] = column.defaultSortOrder;
+    }
+  });
+  return { sort, filter };
+}
+export {
+  checkUndefinedOrNull,
+  genColumnKey,
+  isBordered,
+  isMergeCell,
+  mergePagination,
+  parseDefaultColumnConfig,
+  postDataPipeline,
+  useActionType
+};

package/es/table/utils/useDragSort.d.ts

@@ -0,0 +1,14 @@
+import type { TableComponents } from 'rc-table/es/interface';
+import React from 'react';
+export interface UseDragSortOptions<T> {
+    dataSource?: T[];
+    onDragSortEnd?: (beforeIndex: number, afterIndex: number, newDataSource: T[]) => Promise<void> | void;
+    dragSortKey?: string;
+    components?: TableComponents<T>;
+    rowKey: any;
+    DragHandle: React.FC<any>;
+}
+export declare function useDragSort<T>(props: UseDragSortOptions<T>): {
+    DndContext: (contextProps: any) => import("react/jsx-runtime").JSX.Element;
+    components: TableComponents<T>;
+};