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

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

@@ -475,7 +475,7 @@ export var Gantt = function Gantt(props) {
             _context.next = 2;
             return resource.update({
               filterByTk: task.id,
-              values: _objectSpread(_objectSpread({}, task), {}, _defineProperty({}, fieldNames.progress, task.progress / 100))
+              values: _defineProperty({}, fieldNames.progress, task.progress / 100)
             });
           case 2:
             message.success(t('Saved successfully'));
@@ -493,14 +493,14 @@ export var Gantt = function Gantt(props) {
   }();
   var handleTaskChange = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(task) {
-      var _objectSpread3;
+      var _values2;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.next = 2;
             return resource.update({
               filterByTk: task.id,
-              values: _objectSpread(_objectSpread({}, task), {}, (_objectSpread3 = {}, _defineProperty(_objectSpread3, fieldNames.start, task.start), _defineProperty(_objectSpread3, fieldNames.end, task.end), _objectSpread3))
+              values: (_values2 = {}, _defineProperty(_values2, fieldNames.start, task.start), _defineProperty(_values2, fieldNames.end, task.end), _values2)
             });
           case 2:
             message.success(t('Saved successfully'));

package/es/schema-component/antd/gantt/components/gantt/style.js

@@ -1,6 +1,6 @@
 var _templateObject, _templateObject2, _templateObject3;
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 import { css } from '@emotion/css';
-export var ganttVerticalContainer = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  overflow: hidden;\n  font-size: 0;\n  margin: 0;\n  padding: 0;\n  width:100%;\n  border-left: 2px solid #f4f2f2;\n"])));
+export var ganttVerticalContainer = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  overflow: hidden;\n  font-size: 0;\n  margin: 0;\n  padding: 0;\n  width: 100%;\n  border-left: 2px solid #f4f2f2;\n"])));
 export var horizontalContainer = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  margin: 0;\n  padding: 0;\n  overflow: hidden;\n"])));
 export var wrapper = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  display: flex;\n  padding: 0;\n  margin: 0;\n  list-style: none;\n  outline: none;\n  position: relative;\n  .gantt-horizontal-scoll {\n    display: none;\n  }\n  &:hover {\n    .gantt-horizontal-scoll {\n      display: block;\n    }\n  }\n"])));

package/es/schema-component/antd/gantt/components/grid/grid.d.ts

@@ -1,4 +1,4 @@
-import React from "react";
-import { GridBodyProps } from "./grid-body";
+import React from 'react';
+import { GridBodyProps } from './grid-body';
 export declare type GridProps = GridBodyProps;
 export declare const Grid: React.FC<GridProps>;

package/es/schema-component/antd/gantt/components/grid/grid.js

@@ -4,8 +4,8 @@ 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 React from "react";
-import { GridBody } from "./grid-body";
+import React from 'react';
+import { GridBody } from './grid-body';
 export var Grid = function Grid(props) {
   return /*#__PURE__*/React.createElement("g", {
     className: "grid"

package/es/schema-component/antd/gantt/components/grid/style.js

@@ -3,5 +3,5 @@ function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(
 import { css } from '@emotion/css';
 export var gridRow = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  fill: #fff;\n"])));
 export var gridHeightRow = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  fill: #e6f7ff;\n  border-color: rgba(0, 0, 0, 0.03);\n"])));
-export var gridRowLine = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  stroke: #f0f0f0;\n  stroke-width:0;\n  border-bottom: 1px solid #f0f0f0;\n"])));
+export var gridRowLine = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  stroke: #f0f0f0;\n  stroke-width: 0;\n  border-bottom: 1px solid #f0f0f0;\n"])));
 export var gridTick = css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  stroke: #f0f0f0;\n"])));

package/es/schema-component/antd/gantt/components/other/arrow.d.ts

@@ -1,5 +1,5 @@
-import React from "react";
-import { BarTask } from "../../types/bar-task";
+import React from 'react';
+import { BarTask } from '../../types/bar-task';
 declare type ArrowProps = {
     taskFrom: BarTask;
     taskTo: BarTask;

package/es/schema-component/antd/gantt/components/other/arrow.js

@@ -4,7 +4,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 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; }
-import React from "react";
+import React from 'react';
 export var Arrow = function Arrow(_ref) {
   var taskFrom = _ref.taskFrom,
     taskTo = _ref.taskTo,
@@ -39,7 +39,7 @@ var drownPathAndTriangle = function drownPathAndTriangle(taskFrom, taskTo, rowHe
   var indexCompare = taskFrom.index > taskTo.index ? -1 : 1;
   var taskToEndPosition = taskTo.y + taskHeight / 2;
   var taskFromEndPosition = taskFrom.x2 + arrowIndent * 2;
-  var taskFromHorizontalOffsetValue = taskFromEndPosition < taskTo.x1 ? "" : "H ".concat(taskTo.x1 - arrowIndent);
+  var taskFromHorizontalOffsetValue = taskFromEndPosition < taskTo.x1 ? '' : "H ".concat(taskTo.x1 - arrowIndent);
   var taskToHorizontalOffsetValue = taskFromEndPosition > taskTo.x1 ? arrowIndent : taskTo.x1 - taskFrom.x2 - arrowIndent;
   var path = "M ".concat(taskFrom.x2, " ").concat(taskFrom.y + taskHeight / 2, " \n  h ").concat(arrowIndent, " \n  v ").concat(indexCompare * rowHeight / 2, " \n  ").concat(taskFromHorizontalOffsetValue, "\n  V ").concat(taskToEndPosition, " \n  h ").concat(taskToHorizontalOffsetValue);
   var trianglePoints = "".concat(taskTo.x1, ",").concat(taskToEndPosition, " \n  ").concat(taskTo.x1 - 5, ",").concat(taskToEndPosition - 5, " \n  ").concat(taskTo.x1 - 5, ",").concat(taskToEndPosition + 5);
@@ -49,7 +49,7 @@ var drownPathAndTriangleRTL = function drownPathAndTriangleRTL(taskFrom, taskTo,
   var indexCompare = taskFrom.index > taskTo.index ? -1 : 1;
   var taskToEndPosition = taskTo.y + taskHeight / 2;
   var taskFromEndPosition = taskFrom.x1 - arrowIndent * 2;
-  var taskFromHorizontalOffsetValue = taskFromEndPosition > taskTo.x2 ? "" : "H ".concat(taskTo.x2 + arrowIndent);
+  var taskFromHorizontalOffsetValue = taskFromEndPosition > taskTo.x2 ? '' : "H ".concat(taskTo.x2 + arrowIndent);
   var taskToHorizontalOffsetValue = taskFromEndPosition < taskTo.x2 ? -arrowIndent : taskTo.x2 - taskFrom.x1 + arrowIndent;
   var path = "M ".concat(taskFrom.x1, " ").concat(taskFrom.y + taskHeight / 2, " \n  h ").concat(-arrowIndent, " \n  v ").concat(indexCompare * rowHeight / 2, " \n  ").concat(taskFromHorizontalOffsetValue, "\n  V ").concat(taskToEndPosition, " \n  h ").concat(taskToHorizontalOffsetValue);
   var trianglePoints = "".concat(taskTo.x2, ",").concat(taskToEndPosition, " \n  ").concat(taskTo.x2 + 5, ",").concat(taskToEndPosition + 5, " \n  ").concat(taskTo.x2 + 5, ",").concat(taskToEndPosition - 5);

package/es/schema-component/antd/gantt/components/other/horizontal-scroll.d.ts

@@ -1,4 +1,4 @@
-import React, { SyntheticEvent } from "react";
+import React, { SyntheticEvent } from 'react';
 export declare const HorizontalScroll: React.FC<{
     scroll: number;
     svgWidth: number;

package/es/schema-component/antd/gantt/components/other/horizontal-scroll.js

@@ -1,4 +1,4 @@
-import React, { useRef, useEffect } from "react";
+import React, { useRef, useEffect } from 'react';
 import { cx } from '@emotion/css';
 import { scrollWrapper, horizontalScroll } from './style';
 export var HorizontalScroll = function HorizontalScroll(_ref) {

package/es/schema-component/antd/gantt/components/other/style.js

@@ -1,7 +1,7 @@
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 import { css } from '@emotion/css';
-export var scrollWrapper = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  overflow: auto;\n  position: absolute;\n  bottom: -4px;\n  max-width: 100%;\n  /*firefox*/\n  scrollbar-width: thin;\n  /*iPad*/\n  height: 1.2rem;\n  &::-webkit-scrollbar {\n    width: 1.1rem;\n    height: 1.1rem;\n  }\n  &::-webkit-scrollbar-corner {\n    background: transparent;\n  }\n  &::-webkit-scrollbar-thumb {\n    border: 5px solid transparent;\n    background:  #5c5858cc;\n    border-radius: 10px;\n    background-clip: padding-box;\n  }\n  &::-webkit-scrollbar-thumb:hover {\n    border: 4px solid transparent;\n    background: #5c5858bd;\n    background-clip: padding-box;\n  }\n"])));
+export var scrollWrapper = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  overflow: auto;\n  position: absolute;\n  bottom: -4px;\n  max-width: 100%;\n  /*firefox*/\n  scrollbar-width: thin;\n  /*iPad*/\n  height: 1.2rem;\n  &::-webkit-scrollbar {\n    width: 1.1rem;\n    height: 1.1rem;\n  }\n  &::-webkit-scrollbar-corner {\n    background: transparent;\n  }\n  &::-webkit-scrollbar-thumb {\n    border: 5px solid transparent;\n    background: #5c5858cc;\n    border-radius: 10px;\n    background-clip: padding-box;\n  }\n  &::-webkit-scrollbar-thumb:hover {\n    border: 4px solid transparent;\n    background: #5c5858bd;\n    background-clip: padding-box;\n  }\n"])));
 export var horizontalScroll = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  height: 1px;\n"])));
 export var tooltipDefaultContainer = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  padding: 12px;\n  background-color: #fff;\n  background-clip: padding-box;\n  border-radius: 2px;\n  box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);\n  b {\n    display: block;\n    margin-bottom: 8px;\n  }\n"])));
 export var tooltipDefaultContainerParagraph = css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  font-size: 12px;\n  margin-bottom: 6px;\n  color: #666;\n"])));

package/es/schema-component/antd/gantt/components/task-item/bar/bar-display.d.ts

@@ -1,4 +1,4 @@
-import React from "react";
+import React from 'react';
 declare type BarDisplayProps = {
     x: number;
     y: number;

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

@@ -1,5 +1,5 @@
 import { cx } from '@emotion/css';
-import React from "react";
+import React from 'react';
 import { barBackground } from './style';
 export var BarDisplay = function BarDisplay(_ref) {
   var x = _ref.x,

package/es/schema-component/antd/gantt/components/task-item/bar/bar-small.d.ts

@@ -1,3 +1,3 @@
-import React from "react";
-import { TaskItemProps } from "../task-item";
+import React from 'react';
+import { TaskItemProps } from '../task-item';
 export declare const BarSmall: React.FC<TaskItemProps>;

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

@@ -1,8 +1,8 @@
-import React from "react";
+import React from 'react';
 import { cx } from '@emotion/css';
-import { getProgressPoint } from "../../../helpers/bar-helper";
-import { BarDisplay } from "./bar-display";
-import { BarProgressHandle } from "./bar-progress-handle";
+import { getProgressPoint } from '../../../helpers/bar-helper';
+import { BarDisplay } from './bar-display';
+import { BarProgressHandle } from './bar-progress-handle';
 import { barWrapper } from './style';
 export var BarSmall = function BarSmall(_ref) {
   var task = _ref.task,
@@ -25,14 +25,14 @@ export var BarSmall = function BarSmall(_ref) {
     styles: task.styles,
     isSelected: isSelected,
     onMouseDown: function onMouseDown(e) {
-      isDateChangeable && onEventStart("move", task, e);
+      isDateChangeable && onEventStart('move', task, e);
     }
   }), /*#__PURE__*/React.createElement("g", {
     className: "handleGroup"
   }, isProgressChangeable && /*#__PURE__*/React.createElement(BarProgressHandle, {
     progressPoint: progressPoint,
     onMouseDown: function onMouseDown(e) {
-      onEventStart("progress", task, e);
+      onEventStart('progress', task, e);
     }
   })));
 };

package/es/schema-component/antd/gantt/components/task-item/bar/bar.d.ts

@@ -1,3 +1,3 @@
-import React from "react";
-import { TaskItemProps } from "../task-item";
+import React from 'react';
+import { TaskItemProps } from '../task-item';
 export declare const Bar: React.FC<TaskItemProps>;

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

@@ -1,9 +1,9 @@
 import { cx } from '@emotion/css';
-import React from "react";
-import { getProgressPoint } from "../../../helpers/bar-helper";
-import { BarDateHandle } from "./bar-date-handle";
-import { BarDisplay } from "./bar-display";
-import { BarProgressHandle } from "./bar-progress-handle";
+import React from 'react';
+import { getProgressPoint } from '../../../helpers/bar-helper';
+import { BarDateHandle } from './bar-date-handle';
+import { BarDisplay } from './bar-display';
+import { BarProgressHandle } from './bar-progress-handle';
 import { barWrapper } from './style';
 export var Bar = function Bar(_ref) {
   var task = _ref.task,
@@ -29,7 +29,7 @@ export var Bar = function Bar(_ref) {
     styles: task.styles,
     isSelected: isSelected,
     onMouseDown: function onMouseDown(e) {
-      isDateChangeable && onEventStart("move", task, e);
+      isDateChangeable && onEventStart('move', task, e);
     }
   }), /*#__PURE__*/React.createElement("g", {
     className: "handleGroup"
@@ -40,7 +40,7 @@ export var Bar = function Bar(_ref) {
     height: handleHeight,
     barCornerRadius: task.barCornerRadius,
     onMouseDown: function onMouseDown(e) {
-      onEventStart("start", task, e);
+      onEventStart('start', task, e);
     }
   }), /*#__PURE__*/React.createElement(BarDateHandle, {
     x: task.x2 - task.handleWidth - 1,
@@ -49,12 +49,12 @@ export var Bar = function Bar(_ref) {
     height: handleHeight,
     barCornerRadius: task.barCornerRadius,
     onMouseDown: function onMouseDown(e) {
-      onEventStart("end", task, e);
+      onEventStart('end', task, e);
     }
   })), isProgressChangeable && /*#__PURE__*/React.createElement(BarProgressHandle, {
     progressPoint: progressPoint,
     onMouseDown: function onMouseDown(e) {
-      onEventStart("progress", task, e);
+      onEventStart('progress', task, e);
     }
   })));
 };

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

@@ -1,5 +1,5 @@
 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 { css } from '@emotion/css';
-export var barWrapper = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  cursor: pointer;\n  outline: none;\n  .barHandle{\n    fill: #ddd;\n    cursor: ew-resize;\n    opacity: 0;\n    visibility: hidden;\n  }\n  &:hover .barHandle {\n    visibility: visible;\n    opacity: 1;\n  }\n"])));
-export var barBackground = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  user-select: none;\n  stroke-width: 0;\n  opacity: .6;\n"])));
+export var barWrapper = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  cursor: pointer;\n  outline: none;\n  .barHandle {\n    fill: #ddd;\n    cursor: ew-resize;\n    opacity: 0;\n    visibility: hidden;\n  }\n  &:hover .barHandle {\n    visibility: visible;\n    opacity: 1;\n  }\n"])));
+export var barBackground = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  user-select: none;\n  stroke-width: 0;\n  opacity: 0.6;\n"])));

package/es/schema-component/antd/gantt/components/task-item/milestone/milestone.d.ts

@@ -1,3 +1,3 @@
-import React from "react";
-import { TaskItemProps } from "../task-item";
+import React from 'react';
+import { TaskItemProps } from '../task-item';
 export declare const Milestone: React.FC<TaskItemProps>;

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

@@ -1,4 +1,4 @@
-import React from "react";
+import React from 'react';
 import { cx } from '@emotion/css';
 import { milestoneWrapper, milestoneBackground } from './style';
 export var Milestone = function Milestone(_ref) {
@@ -24,7 +24,7 @@ export var Milestone = function Milestone(_ref) {
     transform: transform,
     className: cx(milestoneBackground),
     onMouseDown: function onMouseDown(e) {
-      isDateChangeable && onEventStart("move", task, e);
+      isDateChangeable && onEventStart('move', task, e);
     }
   }));
 };

package/es/schema-component/antd/gantt/types/bar-task.d.ts

@@ -1,4 +1,4 @@
-import { Task, TaskType } from "./public-types";
+import { Task, TaskType } from './public-types';
 export interface BarTask extends Task {
     index: number;
     typeInternal: TaskTypeInternal;
@@ -19,4 +19,4 @@ export interface BarTask extends Task {
         progressSelectedColor: string;
     };
 }
-export declare type TaskTypeInternal = TaskType | "smalltask";
+export declare type TaskTypeInternal = TaskType | 'smalltask';

package/es/schema-component/antd/gantt/types/date-setup.d.ts

@@ -1,4 +1,4 @@
-import { ViewMode } from "./public-types";
+import { ViewMode } from './public-types';
 export interface DateSetup {
     dates: Date[];
     viewMode: ViewMode;

package/es/schema-component/antd/gantt/types/gantt-task-actions.d.ts

@@ -1,6 +1,6 @@
-import { BarTask } from "./bar-task";
-export declare type BarMoveAction = "progress" | "end" | "start" | "move";
-export declare type GanttContentMoveAction = "mouseenter" | "mouseleave" | "delete" | "dblclick" | "click" | "select" | "" | BarMoveAction;
+import { BarTask } from './bar-task';
+export declare type BarMoveAction = 'progress' | 'end' | 'start' | 'move';
+export declare type GanttContentMoveAction = 'mouseenter' | 'mouseleave' | 'delete' | 'dblclick' | 'click' | 'select' | '' | BarMoveAction;
 export declare type GanttEvent = {
     changedTask?: BarTask;
     originalSelectedTask?: BarTask;

package/es/schema-component/antd/gantt/types/public-types.d.ts

@@ -10,7 +10,7 @@ export declare enum ViewMode {
     QuarterYear = "quarterYear",
     Year = "year"
 }
-export declare type TaskType = "task" | "milestone" | "project";
+export declare type TaskType = 'task' | 'milestone' | 'project';
 export interface Task {
     id: string;
     type: TaskType;

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

@@ -31,6 +31,7 @@ var breakRemoveOnRow = function breakRemoveOnRow(s) {
 };
 var ColDivider = function ColDivider(props) {
   var _dndContext$active, _dndContext$active$da, _dndContext$active$da2;
+  var dragIdRef = useRef(null);
   var _useDroppable = useDroppable({
       id: props.id,
       data: props.data
@@ -81,6 +82,7 @@ var ColDivider = function ColDivider(props) {
       if (!isDragging) {
         return;
       }
+      dragIdRef.current = event.active.id;
       var el = dividerRef.current;
       var prev = el.previousElementSibling;
       var next = el.nextElementSibling;
@@ -90,14 +92,23 @@ var ColDivider = function ColDivider(props) {
       if (!isDragging) {
         return;
       }
+      if (dragIdRef.current === event.active.id) {
+        dragIdRef.current = dragIdRef.current + '_move';
+      }
       var el = dividerRef.current;
       var prev = el.previousElementSibling;
       var next = el.nextElementSibling;
-      prev.style.width = "calc(".concat(clientWidths[0], "px + ").concat(event.delta.x, "px)");
-      next.style.width = "calc(".concat(clientWidths[1], "px - ").concat(event.delta.x, "px)");
+      prev.style.width = "".concat(clientWidths[0] + event.delta.x, "px");
+      next.style.width = "".concat(clientWidths[1] - event.delta.x, "px");
     },
     onDragEnd: function onDragEnd(event) {
-      var _ref, _ref2;
+      var _dragIdRef$current, _ref, _ref2;
+      if (!dragIdRef.current) return;
+      if ((_dragIdRef$current = dragIdRef.current) === null || _dragIdRef$current === void 0 ? void 0 : _dragIdRef$current.startsWith(event.active.id)) {
+        if (!dragIdRef.current.endsWith('_move')) {
+          return;
+        }
+      }
       if (clientWidths[0] <= 0 || clientWidths[1] <= 0) {
         return;
       }
@@ -110,8 +121,11 @@ var ColDivider = function ColDivider(props) {
       var next = el.nextElementSibling;
       prevSchema['x-component-props'] = prevSchema['x-component-props'] || {};
       nextSchema['x-component-props'] = nextSchema['x-component-props'] || {};
-      prevSchema['x-component-props']['width'] = 100 * ((prev === null || prev === void 0 ? void 0 : prev.clientWidth) + 24 + 24 / props.cols.length) / el.parentElement.clientWidth;
-      nextSchema['x-component-props']['width'] = 100 * ((next === null || next === void 0 ? void 0 : next.clientWidth) + 24 + 24 / props.cols.length) / el.parentElement.clientWidth;
+      var dividerWidth = el.clientWidth * (props.cols.length + 1) / props.cols.length;
+      var preWidth = (100 * (prev.getBoundingClientRect().width + dividerWidth) / el.parentElement.clientWidth).toFixed(2);
+      var nextWidth = (100 * (next.getBoundingClientRect().width + dividerWidth) / el.parentElement.clientWidth).toFixed(2);
+      prevSchema['x-component-props']['width'] = preWidth;
+      nextSchema['x-component-props']['width'] = nextWidth;
       dn.emit('batchPatch', {
         schemas: [(_ref = {}, _defineProperty(_ref, 'x-uid', prevSchema['x-uid']), _defineProperty(_ref, 'x-component-props', _objectSpread({}, prevSchema['x-component-props'])), _ref), (_ref2 = {}, _defineProperty(_ref2, 'x-uid', nextSchema['x-uid']), _defineProperty(_ref2, 'x-component-props', _objectSpread({}, nextSchema['x-component-props'])), _ref2)]
       });
@@ -124,12 +138,12 @@ var ColDivider = function ColDivider(props) {
         dividerRef.current = el;
       }
     },
-    className: cls('nb-col-divider', css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          width: var(--nb-spacing);\n        "])))),
+    className: cls('nb-col-divider', css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          flex-shrink: 0;\n          width: var(--nb-spacing);\n        "])))),
     style: _objectSpread({}, droppableStyle)
   }, /*#__PURE__*/React.createElement("div", _objectSpread(_objectSpread(_objectSpread({
     ref: setDraggableNodeRef
   }, listeners), attributes), {}, {
-    className: props.first || props.last || !designable ? null : css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n                &::before {\n                  content: ' ';\n                  width: 12px;\n                  height: 100%;\n                  left: 6px;\n                  position: absolute;\n                  cursor: col-resize;\n                }\n                &:hover {\n                  &::before {\n                    background: rgba(241, 139, 98, 0.06) !important;\n                  }\n                }\n                width: var(--nb-spacing);\n                height: 100%;\n                position: absolute;\n                cursor: col-resize;\n              "])))
+    className: props.first || props.last || !designable ? null : css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n                &::before {\n                  content: ' ';\n                  width: 100%;\n                  height: 100%;\n                  position: absolute;\n                  cursor: col-resize;\n                }\n                &:hover {\n                  &::before {\n                    background: rgba(241, 139, 98, 0.06) !important;\n                  }\n                }\n                width: var(--nb-spacing);\n                height: 100%;\n                position: absolute;\n                cursor: col-resize;\n              "])))
   })));
 };
 var RowDivider = function RowDivider(props) {
@@ -314,7 +328,7 @@ Grid.Row = observer(function () {
       cols: cols
     }
   }, /*#__PURE__*/React.createElement("div", {
-    className: cls('nb-grid-row', css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n            margin: 0 calc(-1 * var(--nb-spacing));\n            display: flex;\n            position: relative;\n            /* z-index: 0; */\n          "]))))
+    className: cls('nb-grid-row', css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n            overflow-x: hidden;\n            margin: 0 calc(-1 * var(--nb-spacing));\n            display: flex;\n            position: relative;\n            /* z-index: 0; */\n          "]))))
   }, /*#__PURE__*/React.createElement(ColDivider, {
     cols: cols,
     first: true,
@@ -355,7 +369,7 @@ Grid.Col = observer(function (props) {
   if (cols === null || cols === void 0 ? void 0 : cols.length) {
     var _schema$xComponentP;
     var w = (schema === null || schema === void 0 ? void 0 : (_schema$xComponentP = schema['x-component-props']) === null || _schema$xComponentP === void 0 ? void 0 : _schema$xComponentP['width']) || 100 / cols.length;
-    width = "calc(".concat(w, "% - var(--nb-spacing) * 2 / ").concat(cols.length, ")");
+    width = "calc(".concat(w, "% - var(--nb-spacing) *  ").concat((cols.length + 1) / cols.length, ")");
   }
   var _useDroppable3 = useDroppable({
       id: field.address.toString(),

package/es/schema-component/antd/icon-picker/IconPicker.js

@@ -21,7 +21,7 @@ import { isValid } from '@formily/shared';
 import { Button, Input, Popover } from 'antd';
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { hasIcon, Icon, icons } from '../../../icon';
+import { Icon, hasIcon, icons } from '../../../icon';
 function IconField(props) {
   var layout = useFormLayout();
   var value = props.value,

package/es/schema-component/antd/input/EllipsisWithTooltip.js

@@ -11,7 +11,15 @@ 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; }
 import { Popover } from 'antd';
-import React, { forwardRef, useImperativeHandle, useState } from 'react';
+import React, { forwardRef, useImperativeHandle, useState, useRef } from 'react';
+var getContentWidth = function getContentWidth(element) {
+  if (element) {
+    var range = document.createRange();
+    range.selectNodeContents(element);
+    var contentWidth = range.getBoundingClientRect().width;
+    return contentWidth;
+  }
+};
 var ellipsisDefaultStyle = {
   overflow: 'hidden',
   overflowWrap: 'break-word',
@@ -28,6 +36,7 @@ export var EllipsisWithTooltip = /*#__PURE__*/forwardRef(function (props, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     visible = _useState4[0],
     setVisible = _useState4[1];
+  var elRef = useRef();
   useImperativeHandle(ref, function () {
     return {
       setPopoverVisible: setVisible
@@ -37,6 +46,12 @@ export var EllipsisWithTooltip = /*#__PURE__*/forwardRef(function (props, ref) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, props.children);
   }
   var popoverContent = props.popoverContent;
+  var isOverflowTooltip = function isOverflowTooltip() {
+    var _elRef$current;
+    var contentWidth = getContentWidth(elRef.current);
+    var offsetWidth = (_elRef$current = elRef.current) === null || _elRef$current === void 0 ? void 0 : _elRef$current.offsetWidth;
+    return contentWidth > offsetWidth;
+  };
   return /*#__PURE__*/React.createElement(Popover, {
     visible: ellipsis && visible,
     onVisibleChange: function onVisibleChange(visible) {
@@ -49,10 +64,14 @@ export var EllipsisWithTooltip = /*#__PURE__*/forwardRef(function (props, ref) {
       }
     }, popoverContent || props.children)
   }, /*#__PURE__*/React.createElement("div", {
+    ref: elRef,
     style: _objectSpread({}, ellipsisDefaultStyle),
     onMouseEnter: function onMouseEnter(e) {
       var el = e.target;
-      setEllipsis(el.scrollWidth > el.clientWidth);
+      var isShowTooltips = isOverflowTooltip();
+      if (isShowTooltips) {
+        setEllipsis(el.scrollWidth >= el.clientWidth);
+      }
     }
   }, props.children));
 });

package/es/schema-component/antd/menu/util.js

@@ -39,7 +39,6 @@ export function findMenuItem(schema) {
   } finally {
     _iterator.f();
   }
-  ;
   return null;
 }
 function findKeys(schema) {

package/es/schema-component/antd/page/Page.js

@@ -22,9 +22,10 @@ import { PlusOutlined } from '@ant-design/icons';
 import { css } from '@emotion/css';
 import { FormDialog, FormLayout } from '@formily/antd';
 import { Schema, SchemaOptionsContext, useFieldSchema } from '@formily/react';
-import { Button, PageHeader as AntdPageHeader, Spin, Tabs } from 'antd';
+import { PageHeader as AntdPageHeader, Button, Spin, Tabs } from 'antd';
 import classNames from 'classnames';
 import React, { useContext, useEffect, useState } from 'react';
+import { ErrorBoundary } from 'react-error-boundary';
 import { useTranslation } from 'react-i18next';
 import { useLocation } from 'react-router-dom';
 import { useDocumentTitle } from '../../../document-title';
@@ -34,6 +35,7 @@ import { DndContext } from '../../common';
 import { SortableItem } from '../../common/sortable-item';
 import { SchemaComponent, SchemaComponentOptions } from '../../core';
 import { useCompile, useDesignable } from '../../hooks';
+import { ErrorFallback } from '../error-fallback';
 import FixedBlock from './FixedBlock';
 import { PageDesigner, PageTabDesigner } from './PageTabDesigner';
 var designerCss = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  position: relative;\n  &:hover {\n    > .general-schema-designer {\n      display: block;\n    }\n  }\n  &.nb-action-link {\n    > .general-schema-designer {\n      top: var(--nb-designer-offset);\n      bottom: var(--nb-designer-offset);\n      right: var(--nb-designer-offset);\n      left: var(--nb-designer-offset);\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"])));
@@ -77,6 +79,9 @@ export var Page = function Page(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     height = _useState6[0],
     setHeight = _useState6[1];
+  var handleErrors = function handleErrors(error) {
+    console.error(error);
+  };
   return /*#__PURE__*/React.createElement(FilterBlockProvider, null, /*#__PURE__*/React.createElement("div", {
     className: pageDesignerCss
   }, /*#__PURE__*/React.createElement(PageDesigner, {
@@ -184,6 +189,9 @@ export var Page = function Page(props) {
       margin: 'var(--nb-spacing)',
       flex: 1
     }
+  }, /*#__PURE__*/React.createElement(ErrorBoundary, {
+    FallbackComponent: ErrorFallback,
+    onError: handleErrors
   }, loading ? /*#__PURE__*/React.createElement(Spin, null) : !disablePageHeader && enablePageTabs ? fieldSchema.mapProperties(function (schema) {
     if (schema.name !== activeKey) return null;
     return /*#__PURE__*/React.createElement(FixedBlock, {
@@ -200,5 +208,5 @@ export var Page = function Page(props) {
     "calc(".concat(height, "px + 46px + var(--nb-spacing) * 2)")
   }, /*#__PURE__*/React.createElement("div", {
     className: pageWithFixedBlockCss
-  }, props.children)))));
+  }, props.children))))));
 };

package/es/schema-component/antd/pagination/index.js

@@ -25,5 +25,5 @@ export var Pagination = observer(function (props) {
   };
   return /*#__PURE__*/React.createElement("div", {
     onKeyPress: onKeypress
-  }, /*#__PURE__*/React.createElement(AntdPagination, _objectSpread({}, others)), ";");
+  }, /*#__PURE__*/React.createElement(AntdPagination, _objectSpread({}, others)));
 });

package/es/schema-component/antd/record-picker/InputRecordPicker.js

@@ -180,7 +180,7 @@ export var InputRecordPicker = function InputRecordPicker(props) {
     multiple: multiple,
     quickUpload: quickUpload,
     selectFile: selectFile,
-    action: "".concat(collectionField.target, ":create"),
+    action: "".concat(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target, ":create"),
     onSelect: handleSelect,
     onRemove: handleRemove,
     onChange: function onChange(changed) {
@@ -208,12 +208,15 @@ export var InputRecordPicker = function InputRecordPicker(props) {
     allowClear: true,
     onChange: function onChange(changed) {
       if (!changed) {
-        _onChange([]);
-        setSelectedRows([]);
-      } else if (!(changed === null || changed === void 0 ? void 0 : changed.length)) {
-        _onChange([]);
-        setSelectedRows([]);
+        var _value = multiple ? [] : null;
+        _onChange(_value);
+        setSelectedRows(_value);
       } else if (Array.isArray(changed)) {
+        if (!changed.length) {
+          _onChange([]);
+          setSelectedRows([]);
+          return;
+        }
         var values = options === null || options === void 0 ? void 0 : options.filter(function (option) {
           return changed.includes(option[fieldNames.value]);
         });
@@ -246,12 +249,11 @@ var Drawer = function Drawer(_ref) {
     setVisible = _ref.setVisible,
     fieldSchema = _ref.fieldSchema,
     options = _ref.options;
-  console.log('collectionField', options);
   var getFilter = function getFilter() {
-    var targetKey = collectionField.targetKey || 'id';
+    var targetKey = (collectionField === null || collectionField === void 0 ? void 0 : collectionField.targetKey) || 'id';
     var list = options.map(function (option) {
       return option[targetKey];
-    });
+    }).filter(Boolean);
     var filter = list.length ? {
       $and: [_defineProperty({}, "".concat(targetKey, ".$ne"), list)]
     } : {};

package/es/schema-component/antd/record-picker/useFieldNames.js

@@ -4,7 +4,7 @@ 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 } from "@formily/react";
+import { useFieldSchema } from '@formily/react';
 export var useFieldNames = function useFieldNames(props) {
   var _fieldSchema$xCompon, _fieldSchema$xCompon$, _fieldSchema$xCompon$2, _fieldSchema$xCompon$3, _fieldSchema$xCompon2;
   var fieldSchema = useFieldSchema();

package/es/schema-component/antd/remote-select/RemoteSelect.d.ts

@@ -9,6 +9,7 @@ export declare type RemoteSelectProps<P = any> = SelectProps<P, any> & {
     wait?: number;
     manual?: boolean;
     mapOptions?: (data: any) => RemoteSelectProps['fieldNames'];
+    targetField?: any;
     service: ResourceActionOptions<P>;
 };
 export declare const RemoteSelect: React.ForwardRefExoticComponent<Partial<SelectProps<any, any> & {
@@ -18,6 +19,7 @@ export declare const RemoteSelect: React.ForwardRefExoticComponent<Partial<Selec
     wait?: number;
     manual?: boolean;
     mapOptions?: (data: any) => RemoteSelectProps['fieldNames'];
+    targetField?: any;
     service: ResourceActionOptions<any>;
 }> & React.RefAttributes<unknown>> & {
     ReadPretty: typeof ReadPretty;