@nocobase/client 0.7.0-alpha.82 → 0.7.1-alpha.4

package/src/block-provider/hooks/index.ts

@@ -1,333 +0,0 @@
-import { useField, useFieldSchema, useForm } from '@formily/react';
-import { message, Modal } from 'antd';
-import { useTranslation } from 'react-i18next';
-import { useHistory } from 'react-router-dom';
-import { useCollection } from '../../collection-manager';
-import { useRecord } from '../../record-provider';
-import { useActionContext, useCompile } from '../../schema-component';
-import { useCurrentUserContext } from '../../user';
-import { useBlockRequestContext, useFilterByTk } from '../BlockProvider';
-import { useDetailsBlockContext } from '../DetailsBlockProvider';
-import { TableFieldResource } from '../TableFieldProvider';
-
-export const usePickActionProps = () => {
-  const form = useForm();
-  return {
-    onClick() {
-      console.log('usePickActionProps', form.values);
-    },
-  };
-};
-
-function isURL(string) {
-  let url;
-
-  try {
-    url = new URL(string);
-  } catch (e) {
-    return false;
-  }
-
-  return url.protocol === 'http:' || url.protocol === 'https:';
-}
-
-const filterValue = (value) => {
-  if (typeof value !== 'object') {
-    return value;
-  }
-  if (!value) {
-    return value;
-  }
-  if (Array.isArray(value)) {
-    return value.map((v) => filterValue(value));
-  }
-  const obj = {};
-  for (const key in value) {
-    if (Object.prototype.hasOwnProperty.call(value, key)) {
-      const val = value[key];
-      if (Array.isArray(val) || (val && typeof val === 'object')) {
-        continue;
-      }
-      obj[key] = val;
-    }
-  }
-  return obj;
-};
-
-export const useCreateActionProps = () => {
-  const form = useForm();
-  const { field, resource, __parent } = useBlockRequestContext();
-  const { visible, setVisible } = useActionContext();
-  const history = useHistory();
-  const { t } = useTranslation();
-  const actionSchema = useFieldSchema();
-  const actionField = useField();
-  const { fields, getField } = useCollection();
-  const compile = useCompile();
-  return {
-    async onClick() {
-      const fieldNames = fields.map((field) => field.name);
-      const { assignedValues, onSuccess, overwriteValues, skipValidator } = actionSchema?.['x-action-settings'] ?? {};
-
-      if (!skipValidator) {
-        await form.submit();
-      }
-      let values = {};
-      for (const key in form.values) {
-        if (fieldNames.includes(key)) {
-          const items = form.values[key];
-          const collectionField = getField(key);
-          if (collectionField.interface === 'linkTo') {
-            const targetKey = collectionField.targetKey || 'id';
-            if (resource instanceof TableFieldResource) {
-              if (Array.isArray(items)) {
-                values[key] = filterValue(items);
-              } else if (items && typeof items === 'object') {
-                values[key] = filterValue(items);
-              } else {
-                values[key] = items;
-              }
-            } else {
-              if (Array.isArray(items)) {
-                values[key] = items.map((item) => item[targetKey]);
-              } else if (items && typeof items === 'object') {
-                values[key] = items[targetKey];
-              } else {
-                values[key] = items;
-              }
-            }
-          } else {
-            values[key] = form.values[key];
-          }
-        } else {
-          values[key] = form.values[key];
-        }
-      }
-      actionField.data = field.data || {};
-      actionField.data.loading = true;
-      await resource.create({
-        values: {
-          ...values,
-          ...overwriteValues,
-          ...assignedValues,
-        },
-      });
-      actionField.data.loading = false;
-      __parent?.service?.refresh?.();
-      setVisible?.(false);
-      if (!onSuccess?.successMessage) {
-        return;
-      }
-      if (onSuccess?.manualClose) {
-        Modal.success({
-          title: compile(onSuccess?.successMessage),
-          onOk: async () => {
-            await form.reset();
-            if (onSuccess?.redirecting && onSuccess?.redirectTo) {
-              if (isURL(onSuccess.redirectTo)) {
-                window.location.href = onSuccess.redirectTo;
-              } else {
-                history.push(onSuccess.redirectTo);
-              }
-            }
-          },
-        });
-      } else {
-        message.success(compile(onSuccess?.successMessage));
-      }
-    },
-  };
-};
-
-export const useCustomizeUpdateActionProps = () => {
-  const { resource, __parent, service } = useBlockRequestContext();
-  const filterByTk = useFilterByTk();
-  const actionSchema = useFieldSchema();
-  const currentRecord = useRecord();
-  const ctx = useCurrentUserContext();
-  const history = useHistory();
-  const compile = useCompile();
-  const form = useForm();
-
-  return {
-    async onClick() {
-      const { assignedValues, onSuccess, skipValidator } = actionSchema?.['x-action-settings'] ?? {};
-      if (skipValidator === false) {
-        await form.submit();
-      }
-      await resource.update({
-        filterByTk,
-        values: { ...assignedValues },
-      });
-      service?.refresh?.();
-      if (!(resource instanceof TableFieldResource)) {
-        __parent?.service?.refresh?.();
-      }
-      if (!onSuccess?.successMessage) {
-        return;
-      }
-      if (onSuccess?.manualClose) {
-        Modal.success({
-          title: compile(onSuccess?.successMessage),
-          onOk: async () => {
-            if (onSuccess?.redirecting && onSuccess?.redirectTo) {
-              if (isURL(onSuccess.redirectTo)) {
-                window.location.href = onSuccess.redirectTo;
-              } else {
-                history.push(onSuccess.redirectTo);
-              }
-            }
-          },
-        });
-      } else {
-        message.success(compile(onSuccess?.successMessage));
-      }
-    },
-  };
-};
-
-export const useUpdateActionProps = () => {
-  const form = useForm();
-  const filterByTk = useFilterByTk();
-  const { field, resource, __parent } = useBlockRequestContext();
-  const { setVisible } = useActionContext();
-  const actionSchema = useFieldSchema();
-  const history = useHistory();
-  const { fields, getField } = useCollection();
-  const compile = useCompile();
-  const actionField = useField();
-  return {
-    async onClick() {
-      const { assignedValues, onSuccess, overwriteValues, skipValidator } = actionSchema?.['x-action-settings'] ?? {};
-
-      if (!skipValidator) {
-        await form.submit();
-      }
-      const fieldNames = fields.map((field) => field.name);
-      let values = {};
-      for (const key in form.values) {
-        if (fieldNames.includes(key)) {
-          const collectionField = getField(key);
-          if (collectionField.interface === 'subTable') {
-            values[key] = form.values[key];
-            continue;
-          }
-          if (field.added && !field.added.has(key)) {
-            continue;
-          }
-          const items = form.values[key];
-          if (collectionField.interface === 'linkTo') {
-            const targetKey = collectionField.targetKey || 'id';
-            if (resource instanceof TableFieldResource) {
-              if (Array.isArray(items)) {
-                values[key] = filterValue(items);
-              } else if (items && typeof items === 'object') {
-                values[key] = filterValue(items);
-              } else {
-                values[key] = items;
-              }
-            } else {
-              if (Array.isArray(items)) {
-                values[key] = items.map((item) => item[targetKey]);
-              } else if (items && typeof items === 'object') {
-                values[key] = items[targetKey];
-              } else {
-                values[key] = items;
-              }
-            }
-          } else {
-            values[key] = form.values[key];
-          }
-        } else {
-          values[key] = form.values[key];
-        }
-      }
-      actionField.data = field.data || {};
-      actionField.data.loading = true;
-      await resource.update({
-        filterByTk,
-        values: {
-          ...values,
-          ...overwriteValues,
-          ...assignedValues,
-        },
-      });
-      actionField.data.loading = false;
-      __parent?.service?.refresh?.();
-      if (!(resource instanceof TableFieldResource)) {
-        __parent?.__parent?.service?.refresh?.();
-      }
-      setVisible?.(false);
-      if (!onSuccess?.successMessage) {
-        return;
-      }
-      if (onSuccess?.manualClose) {
-        Modal.success({
-          title: compile(onSuccess?.successMessage),
-          onOk: async () => {
-            await form.reset();
-            if (onSuccess?.redirecting && onSuccess?.redirectTo) {
-              if (isURL(onSuccess.redirectTo)) {
-                window.location.href = onSuccess.redirectTo;
-              } else {
-                history.push(onSuccess.redirectTo);
-              }
-            }
-          },
-        });
-      } else {
-        message.success(compile(onSuccess?.successMessage));
-      }
-    },
-  };
-};
-
-export const useDestroyActionProps = () => {
-  const filterByTk = useFilterByTk();
-  const { resource, service } = useBlockRequestContext();
-  return {
-    async onClick() {
-      await resource.destroy({
-        filterByTk,
-      });
-      service?.refresh?.();
-    },
-  };
-};
-
-export const useBulkDestroyActionProps = () => {
-  const { field } = useBlockRequestContext();
-  const { resource, service } = useBlockRequestContext();
-  return {
-    async onClick() {
-      if (!field?.data?.selectedRowKeys?.length) {
-        return;
-      }
-      await resource.destroy({
-        filterByTk: field.data?.selectedRowKeys,
-      });
-      field.data.selectedRowKeys = [];
-      service?.refresh?.();
-    },
-  };
-};
-
-export const useDetailsPaginationProps = () => {
-  const ctx = useDetailsBlockContext();
-  const count = ctx.service?.data?.meta?.count || 0;
-  return {
-    simple: true,
-    hidden: count <= 1,
-    current: ctx.service?.data?.meta?.page || 1,
-    total: count,
-    pageSize: 1,
-    async onChange(page) {
-      const params = ctx.service?.params?.[0];
-      ctx.service.run({ ...params, page });
-    },
-    style: {
-      marginTop: 24,
-      textAlign: 'center',
-    },
-  };
-};

package/src/block-provider/index.tsx

@@ -1,10 +0,0 @@
-
-export * from './BlockProvider';
-export * from './BlockSchemaComponentProvider';
-export * from './CalendarBlockProvider';
-export * from './FormBlockProvider';
-export * from './KanbanBlockProvider';
-export * from './TableBlockProvider';
-export * from './TableFieldProvider';
-export * from './TableSelectorProvider';
-

package/src/board/Board.tsx

@@ -1,294 +0,0 @@
-import React, { forwardRef, useState } from 'react';
-import { DragDropContext } from 'react-beautiful-dnd';
-import Column from './Column';
-import ColumnAdder from './ColumnAdder';
-import DefaultCard from './DefaultCard';
-import DefaultColumnHeader from './DefaultColumnHeader';
-import * as helpers from './helpers';
-import { addCard, addColumn, changeColumn, moveCard, moveColumn, removeCard, removeColumn } from './helpers';
-import {
-  getCard,
-  getCoordinates,
-  isAColumnMove,
-  isMovingACardToAnotherPosition,
-  isMovingAColumnToAnotherPosition,
-} from './services';
-import { partialRight, when } from './utils';
-import withDroppable from './withDroppable';
-
-const Columns = forwardRef((props, ref: any) => <div ref={ref} style={{ whiteSpace: 'nowrap' }} {...props} />);
-
-const DroppableBoard = withDroppable(Columns);
-
-const Board: any = (props) => {
-  return props.initialBoard ? <UncontrolledBoard {...props} /> : <ControlledBoard {...props} />;
-};
-
-Object.keys(helpers).forEach((key) => {
-  Board[key] = helpers[key];
-});
-
-function UncontrolledBoard({
-  initialBoard,
-  onCardDragEnd,
-  onColumnDragEnd,
-  allowAddColumn,
-  cardAdderPosition,
-  renderCardAdder,
-  renderColumnAdder,
-  onNewColumnConfirm,
-  onColumnRemove,
-  renderColumnHeader,
-  allowRemoveColumn,
-  allowRenameColumn,
-  onColumnRename,
-  onCardNew,
-  renderCard,
-  allowRemoveCard,
-  onCardRemove,
-  onColumnNew,
-  disableCardDrag,
-  disableColumnDrag,
-  allowAddCard,
-  onNewCardConfirm,
-}) {
-  const [board, setBoard] = useState(initialBoard);
-  const handleOnCardDragEnd = partialRight(handleOnDragEnd, { moveCallback: moveCard, notifyCallback: onCardDragEnd });
-  const handleOnColumnDragEnd = partialRight(handleOnDragEnd, {
-    moveCallback: moveColumn,
-    notifyCallback: onColumnDragEnd,
-  });
-
-  function handleOnDragEnd({ source, destination, subject }, { moveCallback, notifyCallback }) {
-    const reorderedBoard = moveCallback(board, source, destination);
-    when(notifyCallback)((callback) => callback(reorderedBoard, subject, source, destination));
-    setBoard(reorderedBoard);
-  }
-
-  async function handleColumnAdd(newColumn) {
-    const column = renderColumnAdder ? newColumn : await onNewColumnConfirm(newColumn);
-    const boardWithNewColumn = addColumn(board, column);
-    onColumnNew(boardWithNewColumn, column);
-    setBoard(boardWithNewColumn);
-  }
-
-  function handleColumnRemove(column) {
-    const filteredBoard = removeColumn(board, column);
-    onColumnRemove(filteredBoard, column);
-    setBoard(filteredBoard);
-  }
-
-  function handleColumnRename(column, title) {
-    const boardWithRenamedColumn = changeColumn(board, column, { title });
-    onColumnRename(boardWithRenamedColumn, { ...column, title });
-    setBoard(boardWithRenamedColumn);
-  }
-
-  function handleCardAdd(column, card, options = {}) {
-    const boardWithNewCard = addCard(board, column, card, options);
-
-    onCardNew(
-      boardWithNewCard,
-      boardWithNewCard.columns.find(({ id }) => id === column.id),
-      card,
-    );
-    setBoard(boardWithNewCard);
-  }
-
-  async function handleDraftCardAdd(column, card, options = {}) {
-    const newCard = await onNewCardConfirm(card);
-    handleCardAdd(column, newCard, options);
-  }
-
-  function handleCardRemove(column, card) {
-    const boardWithoutCard = removeCard(board, column, card);
-    onCardRemove(
-      boardWithoutCard,
-      boardWithoutCard.columns.find(({ id }) => id === column.id),
-      card,
-    );
-    setBoard(boardWithoutCard);
-  }
-
-  return (
-    <BoardContainer
-      cardAdderPosition={cardAdderPosition}
-      onCardDragEnd={handleOnCardDragEnd}
-      onColumnDragEnd={handleOnColumnDragEnd}
-      renderCardAdder={renderCardAdder}
-      renderColumnAdder={() => {
-        if (!allowAddColumn) return null;
-        if (renderColumnAdder) return renderColumnAdder({ addColumn: handleColumnAdd });
-        if (!onNewColumnConfirm) return null;
-        return <ColumnAdder onConfirm={(title) => handleColumnAdd({ title, cards: [] })} />;
-      }}
-      {...(renderColumnHeader && {
-        renderColumnHeader: (column) =>
-          renderColumnHeader(column, {
-            removeColumn: handleColumnRemove.bind(null, column),
-            renameColumn: handleColumnRename.bind(null, column),
-            addCard: handleCardAdd.bind(null, column),
-          }),
-      })}
-      renderCard={(column, card, dragging) => {
-        if (renderCard) return renderCard(card, { removeCard: handleCardRemove.bind(null, column, card), dragging });
-        return (
-          <DefaultCard
-            dragging={dragging}
-            allowRemoveCard={allowRemoveCard}
-            onCardRemove={(card) => handleCardRemove(column, card)}
-          >
-            {card}
-          </DefaultCard>
-        );
-      }}
-      allowRemoveColumn={allowRemoveColumn}
-      onColumnRemove={handleColumnRemove}
-      allowRenameColumn={allowRenameColumn}
-      onColumnRename={handleColumnRename}
-      disableColumnDrag={disableColumnDrag}
-      disableCardDrag={disableCardDrag}
-      onCardNew={(column, card) => handleDraftCardAdd(column, card, allowAddCard)}
-      allowAddCard={allowAddCard && onNewCardConfirm}
-    >
-      {board}
-    </BoardContainer>
-  );
-}
-
-function ControlledBoard({
-  children: board,
-  onCardDragEnd,
-  onColumnDragEnd,
-  allowAddColumn,
-  renderCardAdder,
-  renderColumnAdder,
-  onNewColumnConfirm,
-  onColumnRemove,
-  renderColumnHeader,
-  allowRemoveColumn,
-  allowRenameColumn,
-  onColumnRename,
-  renderCard,
-  allowAddCard,
-  allowRemoveCard,
-  onCardRemove,
-  disableCardDrag,
-  disableColumnDrag,
-  cardAdderPosition,
-}) {
-  const handleOnCardDragEnd = partialRight(handleOnDragEnd, { notifyCallback: onCardDragEnd });
-  const handleOnColumnDragEnd = partialRight(handleOnDragEnd, { notifyCallback: onColumnDragEnd });
-
-  function handleOnDragEnd({ source, destination, subject }, { notifyCallback }) {
-    when(notifyCallback)((callback) => callback(subject, source, destination));
-  }
-
-  return (
-    <BoardContainer
-      cardAdderPosition={cardAdderPosition}
-      onCardDragEnd={handleOnCardDragEnd}
-      onColumnDragEnd={handleOnColumnDragEnd}
-      renderCardAdder={renderCardAdder}
-      renderColumnAdder={() => {
-        if (!allowAddColumn) return null;
-        if (renderColumnAdder) return renderColumnAdder();
-        if (!onNewColumnConfirm) return null;
-        return <ColumnAdder onConfirm={(title) => onNewColumnConfirm({ title, cards: [] })} />;
-      }}
-      {...(renderColumnHeader && { renderColumnHeader: renderColumnHeader })}
-      renderCard={(column, card, dragging) => {
-        if (renderCard) return renderCard(card, { column, dragging });
-        return (
-          <DefaultCard
-            dragging={dragging}
-            allowRemoveCard={allowRemoveCard}
-            onCardRemove={(card) => onCardRemove(card, column)}
-          >
-            {card}
-          </DefaultCard>
-        );
-      }}
-      allowAddCard={allowAddCard}
-      allowRemoveColumn={allowRemoveColumn}
-      onColumnRemove={onColumnRemove}
-      allowRenameColumn={allowRenameColumn}
-      onColumnRename={onColumnRename}
-      disableColumnDrag={disableColumnDrag}
-      disableCardDrag={disableCardDrag}
-    >
-      {board}
-    </BoardContainer>
-  );
-}
-
-function BoardContainer(props) {
-  const {
-    children: board,
-    renderCard,
-    disableColumnDrag,
-    disableCardDrag,
-    cardAdderPosition,
-    renderCardAdder,
-    renderColumnHeader,
-    renderColumnAdder,
-    allowRemoveColumn,
-    onColumnRemove,
-    allowRenameColumn,
-    onColumnRename,
-    onColumnDragEnd,
-    onCardDragEnd,
-    onCardNew,
-    allowAddCard,
-  } = props;
-  function handleOnDragEnd(event) {
-    const coordinates = getCoordinates(event, board);
-    if (!coordinates.source) return;
-
-    isAColumnMove(event.type)
-      ? isMovingAColumnToAnotherPosition(coordinates) &&
-        onColumnDragEnd({ ...coordinates, subject: board.columns?.[coordinates.source.fromPosition] })
-      : isMovingACardToAnotherPosition(coordinates) &&
-        onCardDragEnd({ ...coordinates, subject: getCard(board, coordinates.source) });
-  }
-  return (
-    <DragDropContext onDragEnd={handleOnDragEnd}>
-      <div style={{ overflowY: 'hidden', display: 'flex', alignItems: 'flex-start' }} className="react-kanban-board">
-        <DroppableBoard droppableId="board-droppable" direction="horizontal" type="BOARD">
-          {board.columns?.map((column, index) => (
-            <Column
-              key={column.id}
-              index={column?.index ?? index}
-              renderCard={renderCard}
-              renderCardAdder={renderCardAdder}
-              renderColumnHeader={(column) =>
-                renderColumnHeader ? (
-                  renderColumnHeader(column)
-                ) : (
-                  <DefaultColumnHeader
-                    allowRemoveColumn={allowRemoveColumn}
-                    onColumnRemove={onColumnRemove}
-                    allowRenameColumn={allowRenameColumn}
-                    onColumnRename={onColumnRename}
-                  >
-                    {column}
-                  </DefaultColumnHeader>
-                )
-              }
-              cardAdderPosition={cardAdderPosition}
-              disableColumnDrag={disableColumnDrag}
-              disableCardDrag={disableCardDrag}
-              onCardNew={onCardNew}
-              allowAddCard={allowAddCard}
-            >
-              {column}
-            </Column>
-          ))}
-        </DroppableBoard>
-        {renderColumnAdder()}
-      </div>
-    </DragDropContext>
-  );
-}
-
-export default Board;

package/src/board/Card.tsx

@@ -1,24 +0,0 @@
-import React from 'react';
-import { Draggable } from 'react-beautiful-dnd';
-
-function Card({ children, index, renderCard, disableCardDrag }) {
-  return (
-    <Draggable draggableId={String(children.id)} index={index} isDragDisabled={disableCardDrag}>
-      {(provided, { isDragging }) => {
-        return (
-          <div
-            ref={provided.innerRef}
-            {...provided.draggableProps}
-            {...provided.dragHandleProps}
-            data-testid={`card-${children.id}`}
-          >
-            {renderCard(isDragging)}
-            {/* <div style={{ display: 'inline-block', whiteSpace: 'normal' }}></div> */}
-          </div>
-        );
-      }}
-    </Draggable>
-  );
-}
-
-export default Card;

package/src/board/CardAdder.tsx

@@ -1,24 +0,0 @@
-import React, { useState } from 'react';
-import CardForm from './CardForm';
-
-function CardAdder({ column, onConfirm }) {
-  function confirmCard(card) {
-    onConfirm(column, card)
-    setAddingCard(false)
-  }
-
-  const [addingCard, setAddingCard] = useState(false)
-
-  return (
-    <>
-      {addingCard ? (
-        <CardForm onConfirm={confirmCard} onCancel={() => setAddingCard(false)} />
-      ) : (
-        <button className='react-kanban-card-adder-button' onClick={() => setAddingCard(!addingCard)}>
-          +
-        </button>
-      )}
-    </>
-  )
-}
-export default CardAdder;