@nocobase/client 0.10.0-alpha.2 → 0.10.0-alpha.4

package/es/schema-component/antd/gantt/components/task-item/task-item.js

@@ -101,5 +101,5 @@ export var TaskItem = function TaskItem(props) {
     y: isProjectBar ? task.y - 8 : isTextInside ? task.y + taskHeight * 0.5 : task.y + taskHeight * 0.65,
     className: isProjectBar ? cx(projectLabel) : isTextInside ? cx(barLabel) : cx(barLabel) && cx(barLabelOutside),
     ref: textRef
-  }, isProjectBar ? "".concat(task.name, ": ").concat(getYmd(task.start), " ~ ").concat(getYmd(task.end)) : task.name));
+  }, isProjectBar && getYmd(task.start) && getYmd(task.end) ? "".concat(task.name, ":  ").concat(getYmd(task.start), " ~ ").concat(getYmd(task.end)) : task.name));
 };

package/es/schema-component/antd/gantt/helpers/bar-helper.d.ts

@@ -1,6 +1,6 @@
-import { Task } from '../types/public-types';
 import { BarTask } from '../types/bar-task';
 import { BarMoveAction } from '../types/gantt-task-actions';
+import { Task } from '../types/public-types';
 export declare const convertToBarTasks: (tasks: Task[], dates: Date[], columnWidth: number, rowHeight: number, taskHeight: number, barCornerRadius: number, handleWidth: number, rtl: boolean, barProgressColor: string, barProgressSelectedColor: string, barBackgroundColor: string, barBackgroundSelectedColor: string, projectProgressColor: string, projectProgressSelectedColor: string, projectBackgroundColor: string, projectBackgroundSelectedColor: string, milestoneBackgroundColor: string, milestoneBackgroundSelectedColor: string) => BarTask[];
 export declare const progressWithByParams: (taskX1: number, taskX2: number, progress: number, rtl: boolean) => number[];
 export declare const progressByProgressWidth: (progressWidth: number, barTask: BarTask) => number;

package/es/schema-component/antd/gantt/helpers/bar-helper.js

@@ -58,7 +58,7 @@ var convertToBar = function convertToBar(task, index, dates, columnWidth, rowHei
   var typeInternal = task.type;
   if (typeInternal === 'task' && x2 - x1 < handleWidth * 2) {
     typeInternal = 'smalltask';
-    x2 = x1 + handleWidth * 2;
+    x2 = x1 > 0 ? x1 + handleWidth * 2 : x1;
   }
   var _progressWithByParams = progressWithByParams(x1, x2, task.progress, rtl),
     _progressWithByParams2 = _slicedToArray(_progressWithByParams, 2),
@@ -126,16 +126,16 @@ var taskXCoordinate = function taskXCoordinate(xDate, dates, columnWidth) {
   var remainderMillis = (xDate === null || xDate === void 0 ? void 0 : xDate.getTime()) - ((_dates$index = dates[index]) === null || _dates$index === void 0 ? void 0 : _dates$index.getTime());
   var percentOfInterval = remainderMillis / (((_dates = dates[index + 1]) === null || _dates === void 0 ? void 0 : _dates.getTime()) - ((_dates$index2 = dates[index]) === null || _dates$index2 === void 0 ? void 0 : _dates$index2.getTime()));
   var x = index * columnWidth + percentOfInterval * columnWidth;
-  return x;
+  return isNaN(x) ? 0 : x;
 };
 var taskXCoordinateRTL = function taskXCoordinateRTL(xDate, dates, columnWidth) {
   var x = taskXCoordinate(xDate, dates, columnWidth);
   x += columnWidth;
-  return x;
+  return isNaN(x) ? 0 : x;
 };
 var taskYCoordinate = function taskYCoordinate(index, rowHeight, taskHeight) {
   var y = index * rowHeight + (rowHeight - taskHeight) / 2;
-  return y;
+  return isNaN(y) ? 0 : y;
 };
 export var progressWithByParams = function progressWithByParams(taskX1, taskX2, progress, rtl) {
   var progressWidth = (taskX2 - taskX1) * progress * 0.01;

package/es/schema-component/antd/gantt/helpers/other-helper.js

@@ -61,5 +61,7 @@ export var sortTasks = function sortTasks(taskA, taskB) {
   }
 };
 export var getYmd = function getYmd(date) {
-  return date.getFullYear() + '/' + "".concat(date.getMonth() + 1) + '/' + date.getDate();
+  if (!isNaN(date.getTime())) {
+    return date.getFullYear() + '/' + "".concat(date.getMonth() + 1) + '/' + date.getDate();
+  }
 };

package/es/schema-component/antd/grid/Grid.js

@@ -14,7 +14,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useDndContext, useDndMonitor, useDraggable, useDroppable } from '@dnd-kit/core';
 import { css } from '@emotion/css';
-import { observer, RecursionField, Schema, useField, useFieldSchema } from '@formily/react';
+import { RecursionField, Schema, observer, useField, useFieldSchema } from '@formily/react';
 import { uid } from '@formily/shared';
 import cls from 'classnames';
 import React, { createContext, useContext, useEffect, useMemo, useRef, useState } from 'react';
@@ -341,7 +341,7 @@ Grid.Row = observer(function () {
       cols: cols
     }
   }, /*#__PURE__*/React.createElement("div", {
-    className: cls('nb-grid-row', css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n              overflow-x: hidden;\n              display: flex;\n              position: relative;\n              /* z-index: 0; */\n            "])))),
+    className: cls('nb-grid-row', css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n              display: flex;\n              position: relative;\n              /* z-index: 0; */\n            "])))),
     style: {
       margin: showDivider ? '0 calc(-1 * var(--nb-spacing))' : null
     }

package/es/schema-component/antd/grid-card/GridCard.Designer.js

@@ -4,21 +4,20 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-import { useFieldSchema, useField } from '@formily/react';
-import React, { useMemo } from 'react';
 import { ArrayItems } from '@formily/antd';
+import { useField, useFieldSchema } from '@formily/react';
 import { Slider } from 'antd';
 import _ from 'lodash';
+import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useCollection, useCollectionFilterOptions, useSortFields } from '../../../collection-manager';
 import { GeneralSchemaDesigner, SchemaSettings } from '../../../schema-settings';
 import { useSchemaTemplate } from '../../../schema-templates';
+import { SchemaComponentOptions } from '../../core';
 import { useDesignable } from '../../hooks';
 import { removeNullCondition } from '../filter';
 import { FilterDynamicComponent } from '../table-v2/FilterDynamicComponent';
-import { SchemaComponentOptions } from '../../core';
 import { defaultColumnCount, gridSizes, pageSizeOptions, screenSizeMaps, screenSizeTitleMaps } from './options';
-Slider;
 var columnCountMarks = [1, 2, 3, 4, 6, 8, 12, 24].reduce(function (obj, cur) {
   obj[cur] = cur;
   return obj;

package/es/schema-component/antd/grid-card/GridCard.Item.js

@@ -1,15 +1,15 @@
 var _templateObject, _templateObject2;
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-import React from 'react';
-import { Card } from 'antd';
 import { css } from '@emotion/css';
 import { useField } from '@formily/react';
+import { Card } from 'antd';
+import React from 'react';
 import { RecordSimpleProvider } from '../../../record-provider';
 var itemCss = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  width: 100%;\n  height: 100%;\n  flex-direction: column;\n  justify-content: space-between;\n  gap: 8px;\n"])));
 export var GridCardItem = function GridCardItem(props) {
   var field = useField();
   return /*#__PURE__*/React.createElement(Card, {
-    className: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n        &,\n        & .ant-card-body {\n          height: 100%;\n        }\n      "])))
+    className: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n        height: 100%;\n        > .ant-card-body {\n          padding: 24px 24px 0px;\n          height: 100%;\n        }\n        .nb-action-bar button {\n          margin-bottom: 10px;\n        }\n      "])))
   }, /*#__PURE__*/React.createElement("div", {
     className: itemCss
   }, /*#__PURE__*/React.createElement(RecordSimpleProvider, {

package/es/schema-component/antd/index.less

@@ -42,7 +42,5 @@
 }
 
 html body {
-  --adm-font-family: -apple-system, BlinkMacSystemFont, Segoe UI, PingFang SC, Hiragino Sans GB,
-  Microsoft YaHei, Helvetica Neue, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji,
-  Segoe UI Symbol;
+  --adm-font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";
 }

package/es/schema-component/antd/list/List.Decorator.js

@@ -6,11 +6,11 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+import { css, cx } from '@emotion/css';
+import { FormLayout } from '@formily/antd';
 import { createForm } from '@formily/core';
 import { FormContext, useField } from '@formily/react';
-import { css, cx } from '@emotion/css';
 import React, { createContext, useContext, useEffect, useMemo } from 'react';
-import { FormLayout } from '@formily/antd';
 import { BlockProvider, useBlockRequestContext } from '../../../block-provider';
 export var ListBlockContext = /*#__PURE__*/createContext({});
 var InternalListBlockProvider = function InternalListBlockProvider(props) {
@@ -40,7 +40,7 @@ var InternalListBlockProvider = function InternalListBlockProvider(props) {
   }, /*#__PURE__*/React.createElement(FormLayout, {
     layout: 'vertical'
   }, /*#__PURE__*/React.createElement("div", {
-    className: cx(css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n                .ant-description-input {\n                  line-height: 34px;\n                }\n                .ant-formily-item-feedback-layout-loose {\n                  margin-bottom: 12px;\n                }\n              "]))))
+    className: cx(css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n                .ant-description-input {\n                  line-height: 34px;\n                }\n                .ant-formily-item-feedback-layout-loose {\n                  display: inline;\n                }\n              "]))))
   }, props.children))));
 };
 export var ListBlockProvider = function ListBlockProvider(props) {

package/es/schema-component/antd/list/List.Item.js

@@ -1,10 +1,10 @@
 var _templateObject;
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-import React from 'react';
 import { css } from '@emotion/css';
 import { useField } from '@formily/react';
+import React from 'react';
 import { RecordSimpleProvider } from '../../../record-provider';
-var itemCss = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  width: 100%;\n  flex-direction: column;\n  // gap: 8px;\n  padding: 5px 0;\n  border-bottom: 1px solid #f0f0f0;\n"])));
+var itemCss = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  width: 100%;\n  flex-direction: column;\n  // gap: 8px;\n  padding: 4px 5px 0;\n  border-bottom: 1px solid #f0f0f0;\n"])));
 export var ListItem = function ListItem(props) {
   var field = useField();
   return /*#__PURE__*/React.createElement("div", {

package/es/schema-component/antd/list/List.d.ts

@@ -1,6 +1,6 @@
-import { ListDesigner } from './List.Designer';
-import { ListBlockProvider } from './List.Decorator';
 import React from 'react';
+import { ListBlockProvider } from './List.Decorator';
+import { ListDesigner } from './List.Designer';
 import { ListItem } from './List.Item';
 export declare const List: ((props: any) => React.JSX.Element) & {
     Item: typeof ListItem;

package/es/schema-component/antd/list/List.js

@@ -12,18 +12,18 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-import { ListDesigner } from './List.Designer';
-import { ListBlockProvider, useListBlockContext, useListItemProps } from './List.Decorator';
-import React, { useCallback, useState } from 'react';
-import { RecursionField, Schema, useField, useFieldSchema } from '@formily/react';
 import { css, cx } from '@emotion/css';
+import { RecursionField, Schema, useField, useFieldSchema } from '@formily/react';
 import { List as AntdList } from 'antd';
-import { useListActionBarProps } from './hooks';
+import React, { useCallback, useState } from 'react';
 import { SortableItem } from '../../common';
 import { SchemaComponentOptions } from '../../core';
 import { useDesigner } from '../../hooks';
+import { useListActionBarProps } from './hooks';
+import { ListBlockProvider, useListBlockContext, useListItemProps } from './List.Decorator';
+import { ListDesigner } from './List.Designer';
 import { ListItem } from './List.Item';
-var designerCss = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  width: 100%;\n  margin-bottom: var(--nb-spacing);\n  &:hover {\n    > .general-schema-designer {\n      display: block;\n    }\n  }\n\n  > .general-schema-designer {\n    position: absolute;\n    z-index: 999;\n    top: 0;\n    bottom: 0;\n    left: 0;\n    right: 0;\n    display: none;\n    background: rgba(241, 139, 98, 0.06);\n    border: 0;\n    pointer-events: none;\n    > .general-schema-designer-icons {\n      position: absolute;\n      right: 2px;\n      top: 2px;\n      line-height: 16px;\n      pointer-events: all;\n      .ant-space-item {\n        background-color: #f18b62;\n        color: #fff;\n        line-height: 16px;\n        width: 16px;\n        padding-left: 1px;\n      }\n    }\n  }\n"])));
+var designerCss = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  width: 100%;\n  margin-bottom: var(--nb-spacing);\n  .nb-action-bar {\n    margin-top: 10px;\n  }\n  &:hover {\n    > .general-schema-designer {\n      display: block;\n    }\n  }\n\n  > .general-schema-designer {\n    position: absolute;\n    z-index: 999;\n    top: 0;\n    bottom: 0;\n    left: 0;\n    right: 0;\n    display: none;\n    background: rgba(241, 139, 98, 0.06);\n    border: 0;\n    pointer-events: none;\n    > .general-schema-designer-icons {\n      position: absolute;\n      right: 2px;\n      top: 2px;\n      line-height: 16px;\n      pointer-events: all;\n      .ant-space-item {\n        background-color: #f18b62;\n        color: #fff;\n        line-height: 16px;\n        width: 16px;\n        padding-left: 1px;\n      }\n    }\n  }\n"])));
 var InternalList = function InternalList(props) {
   var _service$data, _field$value;
   var _useListBlockContext = useListBlockContext(),