@nocobase/client 0.15.0-alpha.3 → 0.15.0-alpha.5

package/es/index.mjs

@@ -88,7 +88,7 @@ import * as ahooks from "ahooks";
 import { useSetState, useRequest as useRequest$1, useBoolean, useEventListener, useCookieState, useMemoizedFn, useDebounce, useSessionStorageState } from "ahooks";
 import cloneDeep from "lodash/cloneDeep";
 import * as nocobaseClientUtils from "@nocobase/utils/client";
-import { isPlainObject, error, getDefaultFormat, str2moment, toGmt, toLocal, dayjs as dayjs$1, getValuesByPath, flatten, unflatten as unflatten$1, forEach, nextTick, isURL, parse, isPortalInBody, isString as isString$1, uid as uid$2, toFixedByStep } from "@nocobase/utils/client";
+import { isPlainObject, error, getDefaultFormat, str2moment, toGmt, toLocal, dayjs as dayjs$1, getValuesByPath, flatten, unflatten as unflatten$1, forEach, nextTick, isURL, parse, isPortalInBody, isString as isString$1, uid as uid$1, toFixedByStep } from "@nocobase/utils/client";
 import deepmerge from "deepmerge";
 import uniq$1 from "lodash/uniq";
 import template from "lodash/template";
@@ -109,7 +109,7 @@ import * as formilyReactiveReact from "@formily/reactive-react";
 import { observer as observer$1 } from "@formily/reactive-react";
 import { ErrorBoundary, useErrorBoundary } from "react-error-boundary";
 import * as antIcons from "@ant-design/icons";
-import antIcons__default, { createFromIconfontCN, CopyOutlined, HighlightOutlined, CloseCircleOutlined, PlusOutlined, DragOutlined, MenuOutlined, DownOutlined, CloseCircleFilled, CloseOutlined, LoadingOutlined, DownloadOutlined as DownloadOutlined$1, DeleteOutlined, SearchOutlined, TableOutlined, FormOutlined, OrderedListOutlined, EditOutlined, LeftOutlined, RightOutlined, CheckOutlined, InboxOutlined, RightSquareOutlined, SyncOutlined, ExclamationCircleFilled, ApiOutlined, SettingOutlined, ReadOutlined, ReloadOutlined } from "@ant-design/icons";
+import antIcons__default, { createFromIconfontCN, CopyOutlined, HighlightOutlined, CloseCircleOutlined, PlusOutlined, DragOutlined, MenuOutlined, DownOutlined, CloseCircleFilled, CloseOutlined, LoadingOutlined, DownloadOutlined as DownloadOutlined$1, DeleteOutlined, SearchOutlined, TableOutlined, FormOutlined, OrderedListOutlined, EditOutlined, LeftOutlined, RightOutlined, CheckOutlined, InboxOutlined, RightSquareOutlined, SyncOutlined, ExclamationCircleFilled, ApiOutlined, SettingOutlined, ReadOutlined, ReloadOutlined, DisconnectOutlined } from "@ant-design/icons";
 import * as i18next from "i18next";
 import i18next__default from "i18next";
 import * as antdCssinjs from "@ant-design/cssinjs";
@@ -162,11 +162,10 @@ import ReactDragListView from "react-drag-listview";
 import { spliceArrayState, exchangeArrayState } from "@formily/core/esm/shared/internals";
 import useAntdInputStyle from "antd/es/input/style";
 import sanitizeHTML from "sanitize-html";
-import { uid as uid$1 } from "@nocobase/utils";
 import LRUCache from "lru-cache";
 import { parseExpression } from "cron-parser";
-import { eq } from "date-arithmetic";
 import { dayjsLocalizer, Calendar as Calendar$2 } from "react-big-calendar";
+import * as dates from "react-big-calendar/lib/utils/dates";
 import solarLunar from "solarlunar-es";
 import { Navigate as Navigate$1 } from "react-big-calendar/dist/react-big-calendar.esm";
 import { useAttach as useAttach$1 } from "@formily/react/esm/hooks/useAttach";
@@ -19796,9 +19795,9 @@ const TableBlockProvider = (props) => {
   const { getCollection, getCollectionField } = useCollectionManager();
   const record = useRecord();
   const collection2 = getCollection(props.collection);
-  const { treeTable } = (fieldSchema == null ? void 0 : fieldSchema["x-decorator-props"]) || {};
+  const { treeTable, dragSortBy } = (fieldSchema == null ? void 0 : fieldSchema["x-decorator-props"]) || {};
   if (props.dragSort) {
-    params["sort"] = ["sort"];
+    params["sort"] = dragSortBy || ["sort"];
   }
   let childrenColumnName = "children";
   if ((collection2 == null ? void 0 : collection2.tree) && treeTable !== false) {
@@ -19839,16 +19838,17 @@ const useTableBlockProps = () => {
   const globalSort = (_c = (_b = (_a = fieldSchema.parent) == null ? void 0 : _a["x-decorator-props"]) == null ? void 0 : _b["params"]) == null ? void 0 : _c["sort"];
   const { getDataBlocks } = useFilterBlock();
   useEffect(() => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j, _k, _l, _m, _n;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j, _k, _l, _m, _n, _o, _p;
     if (!((_a2 = ctx == null ? void 0 : ctx.service) == null ? void 0 : _a2.loading)) {
       field.value = [];
       field.value = (_c2 = (_b2 = ctx == null ? void 0 : ctx.service) == null ? void 0 : _b2.data) == null ? void 0 : _c2.data;
+      field.setInitialValue((_e2 = (_d2 = ctx == null ? void 0 : ctx.service) == null ? void 0 : _d2.data) == null ? void 0 : _e2.data);
       field.data = field.data || {};
-      field.data.selectedRowKeys = (_e2 = (_d2 = ctx == null ? void 0 : ctx.field) == null ? void 0 : _d2.data) == null ? void 0 : _e2.selectedRowKeys;
+      field.data.selectedRowKeys = (_g2 = (_f2 = ctx == null ? void 0 : ctx.field) == null ? void 0 : _f2.data) == null ? void 0 : _g2.selectedRowKeys;
       field.componentProps.pagination = field.componentProps.pagination || {};
-      field.componentProps.pagination.pageSize = (_h2 = (_g2 = (_f2 = ctx == null ? void 0 : ctx.service) == null ? void 0 : _f2.data) == null ? void 0 : _g2.meta) == null ? void 0 : _h2.pageSize;
-      field.componentProps.pagination.total = (_k = (_j = (_i2 = ctx == null ? void 0 : ctx.service) == null ? void 0 : _i2.data) == null ? void 0 : _j.meta) == null ? void 0 : _k.count;
-      field.componentProps.pagination.current = (_n = (_m = (_l = ctx == null ? void 0 : ctx.service) == null ? void 0 : _l.data) == null ? void 0 : _m.meta) == null ? void 0 : _n.page;
+      field.componentProps.pagination.pageSize = (_j = (_i2 = (_h2 = ctx == null ? void 0 : ctx.service) == null ? void 0 : _h2.data) == null ? void 0 : _i2.meta) == null ? void 0 : _j.pageSize;
+      field.componentProps.pagination.total = (_m = (_l = (_k = ctx == null ? void 0 : ctx.service) == null ? void 0 : _k.data) == null ? void 0 : _l.meta) == null ? void 0 : _m.count;
+      field.componentProps.pagination.current = (_p = (_o = (_n = ctx == null ? void 0 : ctx.service) == null ? void 0 : _n.data) == null ? void 0 : _o.meta) == null ? void 0 : _p.page;
     }
   }, [(_d = ctx == null ? void 0 : ctx.service) == null ? void 0 : _d.loading]);
   return {
@@ -22961,7 +22961,8 @@ const Action = observer(
       title,
       onClick,
       style,
-      openSize
+      openSize,
+      disabled: propsDisabled
     } = _a, others = __objRest(_a, [
       "popover",
       "confirm",
@@ -22974,7 +22975,8 @@ const Action = observer(
       "title",
       "onClick",
       "style",
-      "openSize"
+      "openSize",
+      "disabled"
     ]);
     const { wrapSSR, componentCls, hashId } = useStyles$j();
     const { t } = useTranslation();
@@ -22989,7 +22991,7 @@ const Action = observer(
     const record = useRecord();
     const designerProps = fieldSchema["x-designer-props"];
     const openMode = (_b = fieldSchema == null ? void 0 : fieldSchema["x-component-props"]) == null ? void 0 : _b["openMode"];
-    const disabled = form.disabled || field.disabled || ((_c = field.data) == null ? void 0 : _c.disabled) || props.disabled;
+    const disabled = form.disabled || field.disabled || ((_c = field.data) == null ? void 0 : _c.disabled) || propsDisabled;
     const linkageRules = (fieldSchema == null ? void 0 : fieldSchema["x-linkage-rules"]) || [];
     const { designable } = useDesignable();
     const tarComponent = useComponent(component) || component;
@@ -37233,10 +37235,10 @@ const Calendar$1 = observer(
               agendaDateFormat: "M-DD",
               dayHeaderFormat: "YYYY-M-DD",
               dayRangeHeaderFormat: ({ start, end }, culture, local) => {
-                if (eq(start, end, "month")) {
-                  return local.format(start, "Y-M", culture);
+                if (dates.eq(start, end, "month")) {
+                  return local.format(start, "YYYY-M", culture);
                 }
-                return `${local.format(start, "Y-M", culture)} - ${local.format(end, "Y-M", culture)}`;
+                return `${local.format(start, "YYYY-M", culture)} - ${local.format(end, "YYYY-M", culture)}`;
               }
             },
             components: components2,
@@ -37710,7 +37712,7 @@ function useOptions$2({ filter, isTableOid }) {
   const field = useField();
   const ctx = useContext(FilterContext$2);
   const collection2 = useCollection();
-  const targetCollection = isTableOid && (((_a = ctx == null ? void 0 : ctx.field) == null ? void 0 : _a.collectionName) || collection2.name);
+  const targetCollection = isTableOid && (((_a = ctx == null ? void 0 : ctx.field) == null ? void 0 : _a.collectionName) || ctx.collectionName || collection2.name);
   const inheritCollections = useSelfAndChildrenCollections(targetCollection);
   const { collections = [] } = useCollectionManager();
   const currentCollections = (field == null ? void 0 : field.dataSource) ? collections.filter((v) => {
@@ -39224,12 +39226,12 @@ const G2Plot = observer(
 );
 G2Plot.Designer = G2PlotDesigner;
 G2Plot.plots = plots;
-const convertToBarTasks = (tasks, dates, columnWidth, rowHeight, taskHeight, barCornerRadius, handleWidth, rtl, barProgressColor, barProgressSelectedColor, barBackgroundColor, barBackgroundSelectedColor, projectProgressColor, projectProgressSelectedColor, projectBackgroundColor, projectBackgroundSelectedColor, milestoneBackgroundColor, milestoneBackgroundSelectedColor) => {
+const convertToBarTasks = (tasks, dates2, columnWidth, rowHeight, taskHeight, barCornerRadius, handleWidth, rtl, barProgressColor, barProgressSelectedColor, barBackgroundColor, barBackgroundSelectedColor, projectProgressColor, projectProgressSelectedColor, projectBackgroundColor, projectBackgroundSelectedColor, milestoneBackgroundColor, milestoneBackgroundSelectedColor) => {
   let barTasks = tasks.map((t, i) => {
     return convertToBarTask(
       t,
       i,
-      dates,
+      dates2,
       columnWidth,
       rowHeight,
       taskHeight,
@@ -39259,14 +39261,14 @@ const convertToBarTasks = (tasks, dates, columnWidth, rowHeight, taskHeight, bar
   });
   return barTasks;
 };
-const convertToBarTask = (task, index2, dates, columnWidth, rowHeight, taskHeight, barCornerRadius, handleWidth, rtl, barProgressColor, barProgressSelectedColor, barBackgroundColor, barBackgroundSelectedColor, projectProgressColor, projectProgressSelectedColor, projectBackgroundColor, projectBackgroundSelectedColor, milestoneBackgroundColor, milestoneBackgroundSelectedColor) => {
+const convertToBarTask = (task, index2, dates2, columnWidth, rowHeight, taskHeight, barCornerRadius, handleWidth, rtl, barProgressColor, barProgressSelectedColor, barBackgroundColor, barBackgroundSelectedColor, projectProgressColor, projectProgressSelectedColor, projectBackgroundColor, projectBackgroundSelectedColor, milestoneBackgroundColor, milestoneBackgroundSelectedColor) => {
   let barTask;
   switch (task.type) {
     case "milestone":
       barTask = convertToMilestone(
         task,
         index2,
-        dates,
+        dates2,
         columnWidth,
         rowHeight,
         taskHeight,
@@ -39280,7 +39282,7 @@ const convertToBarTask = (task, index2, dates, columnWidth, rowHeight, taskHeigh
       barTask = convertToBar(
         task,
         index2,
-        dates,
+        dates2,
         columnWidth,
         rowHeight,
         taskHeight * 0.5,
@@ -39297,7 +39299,7 @@ const convertToBarTask = (task, index2, dates, columnWidth, rowHeight, taskHeigh
       barTask = convertToBar(
         task,
         index2,
-        dates,
+        dates2,
         columnWidth,
         rowHeight,
         taskHeight,
@@ -39313,15 +39315,15 @@ const convertToBarTask = (task, index2, dates, columnWidth, rowHeight, taskHeigh
   }
   return barTask;
 };
-const convertToBar = (task, index2, dates, columnWidth, rowHeight, taskHeight, barCornerRadius, handleWidth, rtl, barProgressColor, barProgressSelectedColor, barBackgroundColor, barBackgroundSelectedColor) => {
+const convertToBar = (task, index2, dates2, columnWidth, rowHeight, taskHeight, barCornerRadius, handleWidth, rtl, barProgressColor, barProgressSelectedColor, barBackgroundColor, barBackgroundSelectedColor) => {
   let x1;
   let x2;
   if (rtl) {
-    x2 = taskXCoordinateRTL(task.start, dates, columnWidth);
-    x1 = taskXCoordinateRTL(task.end, dates, columnWidth);
+    x2 = taskXCoordinateRTL(task.start, dates2, columnWidth);
+    x1 = taskXCoordinateRTL(task.end, dates2, columnWidth);
   } else {
-    x1 = taskXCoordinate(task.start, dates, columnWidth);
-    x2 = taskXCoordinate(task.end, dates, columnWidth);
+    x1 = taskXCoordinate(task.start, dates2, columnWidth);
+    x2 = taskXCoordinate(task.end, dates2, columnWidth);
   }
   let typeInternal = task.type;
   if (typeInternal === "task" && x2 - x1 < handleWidth * 2) {
@@ -39353,8 +39355,8 @@ const convertToBar = (task, index2, dates, columnWidth, rowHeight, taskHeight, b
     styles
   });
 };
-const convertToMilestone = (task, index2, dates, columnWidth, rowHeight, taskHeight, barCornerRadius, handleWidth, milestoneBackgroundColor, milestoneBackgroundSelectedColor) => {
-  const x = taskXCoordinate(task.start, dates, columnWidth);
+const convertToMilestone = (task, index2, dates2, columnWidth, rowHeight, taskHeight, barCornerRadius, handleWidth, milestoneBackgroundColor, milestoneBackgroundSelectedColor) => {
+  const x = taskXCoordinate(task.start, dates2, columnWidth);
   const y = taskYCoordinate(index2, rowHeight, taskHeight);
   const x1 = x - taskHeight * 0.5;
   const x2 = x + taskHeight * 0.5;
@@ -39383,16 +39385,16 @@ const convertToMilestone = (task, index2, dates, columnWidth, rowHeight, taskHei
     styles
   });
 };
-const taskXCoordinate = (xDate, dates, columnWidth) => {
+const taskXCoordinate = (xDate, dates2, columnWidth) => {
   var _a, _b, _c;
-  const index2 = dates.findIndex((d) => (d == null ? void 0 : d.getTime()) >= (xDate == null ? void 0 : xDate.getTime())) - 1;
-  const remainderMillis = (xDate == null ? void 0 : xDate.getTime()) - ((_a = dates[index2]) == null ? void 0 : _a.getTime());
-  const percentOfInterval = remainderMillis / (((_b = dates[index2 + 1]) == null ? void 0 : _b.getTime()) - ((_c = dates[index2]) == null ? void 0 : _c.getTime()));
+  const index2 = dates2.findIndex((d) => (d == null ? void 0 : d.getTime()) >= (xDate == null ? void 0 : xDate.getTime())) - 1;
+  const remainderMillis = (xDate == null ? void 0 : xDate.getTime()) - ((_a = dates2[index2]) == null ? void 0 : _a.getTime());
+  const percentOfInterval = remainderMillis / (((_b = dates2[index2 + 1]) == null ? void 0 : _b.getTime()) - ((_c = dates2[index2]) == null ? void 0 : _c.getTime()));
   const x = index2 * columnWidth + percentOfInterval * columnWidth;
   return isNaN(x) ? 0 : x;
 };
-const taskXCoordinateRTL = (xDate, dates, columnWidth) => {
-  let x = taskXCoordinate(xDate, dates, columnWidth);
+const taskXCoordinateRTL = (xDate, dates2, columnWidth) => {
+  let x = taskXCoordinate(xDate, dates2, columnWidth);
   x += columnWidth;
   return isNaN(x) ? 0 : x;
 };
@@ -39705,7 +39707,7 @@ const ganttDateRange = (tasks, viewMode, preStepsCount) => {
 };
 const seedDates = (startDate, endDate, viewMode) => {
   let currentDate = new Date(startDate);
-  const dates = [currentDate];
+  const dates2 = [currentDate];
   while (currentDate < endDate) {
     switch (viewMode) {
       case ViewMode.Year:
@@ -39733,9 +39735,9 @@ const seedDates = (startDate, endDate, viewMode) => {
         currentDate = addToDate(currentDate, 1, "hour");
         break;
     }
-    dates.push(currentDate);
+    dates2.push(currentDate);
   }
-  return dates;
+  return dates2;
 };
 const getLocaleMonth = (date2, locale2) => {
   let bottomValue = getCachedDateTimeFormat(locale2, {
@@ -40286,11 +40288,11 @@ const Calendar = ({
     const bottomValues2 = [];
     let weeksCount = 1;
     const topDefaultHeight = headerHeight * 0.5;
-    const dates = dateSetup.dates;
-    for (let i = dates.length - 1; i >= 0; i--) {
-      const date2 = dates[i];
+    const dates2 = dateSetup.dates;
+    for (let i = dates2.length - 1; i >= 0; i--) {
+      const date2 = dates2[i];
       let topValue = "";
-      if (i === 0 || date2.getMonth() !== dates[i - 1].getMonth()) {
+      if (i === 0 || date2.getMonth() !== dates2[i - 1].getMonth()) {
         topValue = `${getLocaleMonth(date2, locale2)}, ${date2.getFullYear()}`;
       }
       const bottomValue = `W${getWeekNumberISO8601(date2)}`;
@@ -40307,7 +40309,7 @@ const Calendar = ({
         )
       );
       if (topValue) {
-        if (i !== dates.length - 1) {
+        if (i !== dates2.length - 1) {
           topValues2.push(
             /* @__PURE__ */ jsx(
               TopPartOfCalendar,
@@ -40333,9 +40335,9 @@ const Calendar = ({
     const topValues2 = [];
     const bottomValues2 = [];
     const topDefaultHeight = headerHeight * 0.5;
-    const dates = dateSetup.dates;
-    for (let i = 0; i < dates.length; i++) {
-      const date2 = dates[i];
+    const dates2 = dateSetup.dates;
+    for (let i = 0; i < dates2.length; i++) {
+      const date2 = dates2[i];
       const bottomValue = `${date2.getDate().toString()}`;
       bottomValues2.push(
         /* @__PURE__ */ jsx(
@@ -40349,7 +40351,7 @@ const Calendar = ({
           date2.getTime()
         )
       );
-      if (i + 1 !== dates.length && date2.getMonth() !== dates[i + 1].getMonth()) {
+      if (i + 1 !== dates2.length && date2.getMonth() !== dates2[i + 1].getMonth()) {
         const topValue = getLocaleMonth(date2, locale2);
         topValues2.push(
           /* @__PURE__ */ jsx(
@@ -40374,9 +40376,9 @@ const Calendar = ({
     const bottomValues2 = [];
     const ticks = viewMode === ViewMode.HalfDay ? 2 : 4;
     const topDefaultHeight = headerHeight * 0.5;
-    const dates = dateSetup.dates;
-    for (let i = 0; i < dates.length; i++) {
-      const date2 = dates[i];
+    const dates2 = dateSetup.dates;
+    for (let i = 0; i < dates2.length; i++) {
+      const date2 = dates2[i];
       const bottomValue = getCachedDateTimeFormat(locale2, {
         hour: "numeric"
       }).format(date2).replace("时", "");
@@ -40393,7 +40395,7 @@ const Calendar = ({
           date2.getTime()
         )
       );
-      if (i === 0 || date2.getDate() !== dates[i - 1].getDate()) {
+      if (i === 0 || date2.getDate() !== dates2[i - 1].getDate()) {
         const topValue = `${getLocalDayOfWeek(date2, locale2, "short")}, ${date2.getDate()} ${getLocaleMonth(
           date2,
           locale2
@@ -40421,9 +40423,9 @@ const Calendar = ({
     const topValues2 = [];
     const bottomValues2 = [];
     const topDefaultHeight = headerHeight * 0.5;
-    const dates = dateSetup.dates;
-    for (let i = 0; i < dates.length; i++) {
-      const date2 = dates[i];
+    const dates2 = dateSetup.dates;
+    for (let i = 0; i < dates2.length; i++) {
+      const date2 = dates2[i];
       const bottomValue = (_a = getCachedDateTimeFormat(locale2, {
         hour: "numeric"
       }).format(date2)) == null ? void 0 : _a.replace("时", "");
@@ -40440,8 +40442,8 @@ const Calendar = ({
           date2.getTime()
         )
       );
-      if (i !== 0 && date2.getDate() !== dates[i - 1].getDate()) {
-        const displayDate = dates[i - 1];
+      if (i !== 0 && date2.getDate() !== dates2[i - 1].getDate()) {
+        const displayDate = dates2[i - 1];
         const topValue = `${getLocalDayOfWeek(displayDate, locale2, "long")}, ${displayDate.getDate()} ${getLocaleMonth(
           displayDate,
           locale2
@@ -40530,10 +40532,10 @@ const useStyles$b = genStyleHook("nb-grid-body", (token) => {
     }
   };
 });
-const empty = [{ id: uid$2() }, { id: uid$2() }, { id: uid$2() }];
+const empty = [{ id: uid$1() }, { id: uid$1() }, { id: uid$1() }];
 const GridBody = ({
   tasks,
-  dates,
+  dates: dates2,
   rowHeight,
   svgWidth,
   columnWidth,
@@ -40581,14 +40583,14 @@ const GridBody = ({
   let tickX = 0;
   const ticks = [];
   let today = /* @__PURE__ */ jsx("rect", {});
-  for (let i = 0; i < dates.length; i++) {
-    const date2 = dates[i];
+  for (let i = 0; i < dates2.length; i++) {
+    const date2 = dates2[i];
     ticks.push(/* @__PURE__ */ jsx("line", { x1: tickX, y1: 0, x2: tickX, y2: y, className: cx("gridTick") }, date2.getTime()));
-    if (i + 1 !== dates.length && date2.getTime() < now.getTime() && dates[i + 1].getTime() >= now.getTime() || // if current date is last
-    i !== 0 && i + 1 === dates.length && date2.getTime() < now.getTime() && addToDate(date2, date2.getTime() - dates[i - 1].getTime(), "millisecond").getTime() >= now.getTime()) {
+    if (i + 1 !== dates2.length && date2.getTime() < now.getTime() && dates2[i + 1].getTime() >= now.getTime() || // if current date is last
+    i !== 0 && i + 1 === dates2.length && date2.getTime() < now.getTime() && addToDate(date2, date2.getTime() - dates2[i - 1].getTime(), "millisecond").getTime() >= now.getTime()) {
       today = /* @__PURE__ */ jsx("rect", { x: tickX, y: 0, width: columnWidth, height: y, fill: todayColor });
     }
-    if (rtl && i + 1 !== dates.length && date2.getTime() >= now.getTime() && dates[i + 1].getTime() < now.getTime()) {
+    if (rtl && i + 1 !== dates2.length && date2.getTime() >= now.getTime() && dates2[i + 1].getTime() < now.getTime()) {
       today = /* @__PURE__ */ jsx("rect", { x: tickX + columnWidth, y: 0, width: columnWidth, height: y, fill: todayColor });
     }
     tickX += columnWidth;
@@ -41055,7 +41057,7 @@ let lastAction = null;
 let lastStart = null;
 const TaskGanttContent = ({
   tasks,
-  dates,
+  dates: dates2,
   ganttEvent,
   selectedTask,
   rowHeight,
@@ -41084,10 +41086,10 @@ const TaskGanttContent = ({
   const [isMoving, setIsMoving] = useState(false);
   useEffect(() => {
     var _a2, _b, _c, _d;
-    const dateDelta = ((_a2 = dates[1]) == null ? void 0 : _a2.getTime()) - ((_b = dates[0]) == null ? void 0 : _b.getTime()) - ((_c = dates[1]) == null ? void 0 : _c.getTimezoneOffset()) * 60 * 1e3 + ((_d = dates[0]) == null ? void 0 : _d.getTimezoneOffset()) * 60 * 1e3;
+    const dateDelta = ((_a2 = dates2[1]) == null ? void 0 : _a2.getTime()) - ((_b = dates2[0]) == null ? void 0 : _b.getTime()) - ((_c = dates2[1]) == null ? void 0 : _c.getTimezoneOffset()) * 60 * 1e3 + ((_d = dates2[0]) == null ? void 0 : _d.getTimezoneOffset()) * 60 * 1e3;
     const newXStep = timeStep * columnWidth / dateDelta;
     setXStep(newXStep);
-  }, [columnWidth, dates, timeStep]);
+  }, [columnWidth, dates2, timeStep]);
   useEffect(() => {
     const handleMouseMove = (event) => __async(void 0, null, function* () {
       var _a2;
@@ -41502,9 +41504,9 @@ const Gantt = (props) => {
   ]);
   useEffect(() => {
     if (viewMode === dateSetup.viewMode && (viewDate && !currentViewDate || viewDate && (currentViewDate == null ? void 0 : currentViewDate.valueOf()) !== viewDate.valueOf())) {
-      const dates = dateSetup.dates;
-      const index2 = dates.findIndex(
-        (d, i) => viewDate.valueOf() >= d.valueOf() && i + 1 !== dates.length && viewDate.valueOf() < dates[i + 1].valueOf()
+      const dates2 = dateSetup.dates;
+      const index2 = dates2.findIndex(
+        (d, i) => viewDate.valueOf() >= d.valueOf() && i + 1 !== dates2.length && viewDate.valueOf() < dates2[i + 1].valueOf()
       );
       if (index2 === -1) {
         return;
@@ -42962,7 +42964,7 @@ function IconField(props) {
   const { value, onChange, disabled } = props;
   const [visible, setVisible] = useState(false);
   const { t } = useTranslation();
-  return /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsxs(Input$4.Group, { compact: true, children: [
+  return /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsxs(Space$1.Compact, { children: [
     /* @__PURE__ */ jsx(
       PopoverWithStopPropagation,
       {
@@ -48112,6 +48114,7 @@ const TableBlockDesigner = () => {
     },
     [dn, field.decoratorProps, fieldSchema, service]
   );
+  const api = useAPIClient();
   return (
     // fix https://nocobase.height.app/T-2259
     /* @__PURE__ */ jsx(RecordProvider, { parent: record, record: {}, children: /* @__PURE__ */ jsxs(GeneralSchemaDesigner, { template: template2, title: title || name, children: [
@@ -48142,18 +48145,28 @@ const TableBlockDesigner = () => {
         {
           title: t("Enable drag and drop sorting"),
           checked: field.decoratorProps.dragSort,
-          onChange: (dragSort2) => {
-            var _a2;
+          onChange: (dragSort2) => __async(void 0, null, function* () {
+            var _a2, _b2, _c2;
+            if (dragSort2 && collectionField) {
+              const { data } = yield api.resource("collections.fields", collectionField.collectionName).update({
+                filterByTk: collectionField.name,
+                values: {
+                  sortable: true
+                }
+              });
+              const sortBy = (_b2 = (_a2 = data == null ? void 0 : data.data) == null ? void 0 : _a2[0]) == null ? void 0 : _b2.sortBy;
+              fieldSchema["x-decorator-props"].dragSortBy = sortBy;
+            }
             field.decoratorProps.dragSort = dragSort2;
             fieldSchema["x-decorator-props"].dragSort = dragSort2;
-            service.run(__spreadProps(__spreadValues({}, (_a2 = service.params) == null ? void 0 : _a2[0]), { sort: "sort" }));
+            service.run(__spreadProps(__spreadValues({}, (_c2 = service.params) == null ? void 0 : _c2[0]), { sort: fieldSchema["x-decorator-props"].dragSortBy }));
             dn.emit("patch", {
               schema: {
                 ["x-uid"]: fieldSchema["x-uid"],
                 "x-decorator-props": fieldSchema["x-decorator-props"]
               }
             });
-          }
+          })
         }
       ),
       /* @__PURE__ */ jsx(FixedBlockDesignerItem, {}),
@@ -65891,8 +65904,9 @@ const getProps = (app) => {
   if (app.ws.serverDown) {
     return {
       status: "error",
-      title: "App error",
-      subTitle: "The server is down"
+      icon: /* @__PURE__ */ jsx(DisconnectOutlined, {}),
+      title: "You're offline",
+      subTitle: "Please check the server status or network connection status"
     };
   }
   if (!app.error) {

package/lib/index.js

@@ -752,11 +752,10 @@ var import_react_drag_listview = __toESM(require("react-drag-listview"));
 var import_internals = require("@formily/core/esm/shared/internals");
 var import_style3 = __toESM(require("antd/es/input/style"));
 var import_sanitize_html = __toESM(require("sanitize-html"));
-var import_utils = require("@nocobase/utils");
 var import_lru_cache = __toESM(require("lru-cache"));
 var import_cron_parser = require("cron-parser");
-var import_date_arithmetic = require("date-arithmetic");
 var import_react_big_calendar = require("react-big-calendar");
+var dates = __toESM(require("react-big-calendar/lib/utils/dates"));
 var import_solarlunar_es = __toESM(require("solarlunar-es"));
 var import_react_big_calendar2 = require("react-big-calendar/dist/react-big-calendar.esm");
 var import_useAttach = require("@formily/react/esm/hooks/useAttach");
@@ -20446,9 +20445,9 @@ const TableBlockProvider = (props) => {
   const { getCollection, getCollectionField } = useCollectionManager();
   const record = useRecord();
   const collection2 = getCollection(props.collection);
-  const { treeTable } = (fieldSchema == null ? void 0 : fieldSchema["x-decorator-props"]) || {};
+  const { treeTable, dragSortBy } = (fieldSchema == null ? void 0 : fieldSchema["x-decorator-props"]) || {};
   if (props.dragSort) {
-    params["sort"] = ["sort"];
+    params["sort"] = dragSortBy || ["sort"];
   }
   let childrenColumnName = "children";
   if ((collection2 == null ? void 0 : collection2.tree) && treeTable !== false) {
@@ -20489,16 +20488,17 @@ const useTableBlockProps = () => {
   const globalSort = (_c = (_b = (_a = fieldSchema.parent) == null ? void 0 : _a["x-decorator-props"]) == null ? void 0 : _b["params"]) == null ? void 0 : _c["sort"];
   const { getDataBlocks } = useFilterBlock();
   (0, import_react2.useEffect)(() => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j, _k, _l, _m, _n;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j, _k, _l, _m, _n, _o, _p;
     if (!((_a2 = ctx == null ? void 0 : ctx.service) == null ? void 0 : _a2.loading)) {
       field.value = [];
       field.value = (_c2 = (_b2 = ctx == null ? void 0 : ctx.service) == null ? void 0 : _b2.data) == null ? void 0 : _c2.data;
+      field.setInitialValue((_e2 = (_d2 = ctx == null ? void 0 : ctx.service) == null ? void 0 : _d2.data) == null ? void 0 : _e2.data);
       field.data = field.data || {};
-      field.data.selectedRowKeys = (_e2 = (_d2 = ctx == null ? void 0 : ctx.field) == null ? void 0 : _d2.data) == null ? void 0 : _e2.selectedRowKeys;
+      field.data.selectedRowKeys = (_g2 = (_f2 = ctx == null ? void 0 : ctx.field) == null ? void 0 : _f2.data) == null ? void 0 : _g2.selectedRowKeys;
       field.componentProps.pagination = field.componentProps.pagination || {};
-      field.componentProps.pagination.pageSize = (_h2 = (_g2 = (_f2 = ctx == null ? void 0 : ctx.service) == null ? void 0 : _f2.data) == null ? void 0 : _g2.meta) == null ? void 0 : _h2.pageSize;
-      field.componentProps.pagination.total = (_k = (_j = (_i2 = ctx == null ? void 0 : ctx.service) == null ? void 0 : _i2.data) == null ? void 0 : _j.meta) == null ? void 0 : _k.count;
-      field.componentProps.pagination.current = (_n = (_m = (_l = ctx == null ? void 0 : ctx.service) == null ? void 0 : _l.data) == null ? void 0 : _m.meta) == null ? void 0 : _n.page;
+      field.componentProps.pagination.pageSize = (_j = (_i2 = (_h2 = ctx == null ? void 0 : ctx.service) == null ? void 0 : _h2.data) == null ? void 0 : _i2.meta) == null ? void 0 : _j.pageSize;
+      field.componentProps.pagination.total = (_m = (_l = (_k = ctx == null ? void 0 : ctx.service) == null ? void 0 : _k.data) == null ? void 0 : _l.meta) == null ? void 0 : _m.count;
+      field.componentProps.pagination.current = (_p = (_o = (_n = ctx == null ? void 0 : ctx.service) == null ? void 0 : _n.data) == null ? void 0 : _o.meta) == null ? void 0 : _p.page;
     }
   }, [(_d = ctx == null ? void 0 : ctx.service) == null ? void 0 : _d.loading]);
   return {
@@ -23611,7 +23611,8 @@ const Action = (0, import_react.observer)(
       title,
       onClick,
       style,
-      openSize
+      openSize,
+      disabled: propsDisabled
     } = _a, others = __objRest(_a, [
       "popover",
       "confirm",
@@ -23624,7 +23625,8 @@ const Action = (0, import_react.observer)(
       "title",
       "onClick",
       "style",
-      "openSize"
+      "openSize",
+      "disabled"
     ]);
     const { wrapSSR, componentCls, hashId } = useStyles$j();
     const { t } = (0, import_react_i18next.useTranslation)();
@@ -23639,7 +23641,7 @@ const Action = (0, import_react.observer)(
     const record = useRecord();
     const designerProps = fieldSchema["x-designer-props"];
     const openMode = (_b = fieldSchema == null ? void 0 : fieldSchema["x-component-props"]) == null ? void 0 : _b["openMode"];
-    const disabled = form.disabled || field.disabled || ((_c = field.data) == null ? void 0 : _c.disabled) || props.disabled;
+    const disabled = form.disabled || field.disabled || ((_c = field.data) == null ? void 0 : _c.disabled) || propsDisabled;
     const linkageRules = (fieldSchema == null ? void 0 : fieldSchema["x-linkage-rules"]) || [];
     const { designable } = useDesignable();
     const tarComponent = useComponent(component) || component;
@@ -37883,10 +37885,10 @@ const Calendar$1 = (0, import_react.observer)(
               agendaDateFormat: "M-DD",
               dayHeaderFormat: "YYYY-M-DD",
               dayRangeHeaderFormat: ({ start, end }, culture, local) => {
-                if ((0, import_date_arithmetic.eq)(start, end, "month")) {
-                  return local.format(start, "Y-M", culture);
+                if (dates.eq(start, end, "month")) {
+                  return local.format(start, "YYYY-M", culture);
                 }
-                return `${local.format(start, "Y-M", culture)} - ${local.format(end, "Y-M", culture)}`;
+                return `${local.format(start, "YYYY-M", culture)} - ${local.format(end, "YYYY-M", culture)}`;
               }
             },
             components: components2,
@@ -38360,7 +38362,7 @@ function useOptions$2({ filter, isTableOid }) {
   const field = (0, import_react.useField)();
   const ctx = (0, import_react2.useContext)(FilterContext$2);
   const collection2 = useCollection();
-  const targetCollection = isTableOid && (((_a = ctx == null ? void 0 : ctx.field) == null ? void 0 : _a.collectionName) || collection2.name);
+  const targetCollection = isTableOid && (((_a = ctx == null ? void 0 : ctx.field) == null ? void 0 : _a.collectionName) || ctx.collectionName || collection2.name);
   const inheritCollections = useSelfAndChildrenCollections(targetCollection);
   const { collections = [] } = useCollectionManager();
   const currentCollections = (field == null ? void 0 : field.dataSource) ? collections.filter((v) => {
@@ -38826,7 +38828,7 @@ function replaceVariables(_0, _1) {
     }
     const waitForParsing = (_a = value.match(REGEX_OF_VARIABLE)) == null ? void 0 : _a.map((item) => __async(this, null, function* () {
       const result = yield variables.parseVariable(item, localVariables);
-      const id2 = `_${(0, import_utils.uid)()}`;
+      const id2 = `_${(0, import_client.uid)()}`;
       scope[id2] = result;
       store[item] = id2;
       return result;
@@ -39874,12 +39876,12 @@ const G2Plot = (0, import_react.observer)(
 );
 G2Plot.Designer = G2PlotDesigner;
 G2Plot.plots = plots;
-const convertToBarTasks = (tasks, dates, columnWidth, rowHeight, taskHeight, barCornerRadius, handleWidth, rtl, barProgressColor, barProgressSelectedColor, barBackgroundColor, barBackgroundSelectedColor, projectProgressColor, projectProgressSelectedColor, projectBackgroundColor, projectBackgroundSelectedColor, milestoneBackgroundColor, milestoneBackgroundSelectedColor) => {
+const convertToBarTasks = (tasks, dates2, columnWidth, rowHeight, taskHeight, barCornerRadius, handleWidth, rtl, barProgressColor, barProgressSelectedColor, barBackgroundColor, barBackgroundSelectedColor, projectProgressColor, projectProgressSelectedColor, projectBackgroundColor, projectBackgroundSelectedColor, milestoneBackgroundColor, milestoneBackgroundSelectedColor) => {
   let barTasks = tasks.map((t, i) => {
     return convertToBarTask(
       t,
       i,
-      dates,
+      dates2,
       columnWidth,
       rowHeight,
       taskHeight,
@@ -39909,14 +39911,14 @@ const convertToBarTasks = (tasks, dates, columnWidth, rowHeight, taskHeight, bar
   });
   return barTasks;
 };
-const convertToBarTask = (task, index2, dates, columnWidth, rowHeight, taskHeight, barCornerRadius, handleWidth, rtl, barProgressColor, barProgressSelectedColor, barBackgroundColor, barBackgroundSelectedColor, projectProgressColor, projectProgressSelectedColor, projectBackgroundColor, projectBackgroundSelectedColor, milestoneBackgroundColor, milestoneBackgroundSelectedColor) => {
+const convertToBarTask = (task, index2, dates2, columnWidth, rowHeight, taskHeight, barCornerRadius, handleWidth, rtl, barProgressColor, barProgressSelectedColor, barBackgroundColor, barBackgroundSelectedColor, projectProgressColor, projectProgressSelectedColor, projectBackgroundColor, projectBackgroundSelectedColor, milestoneBackgroundColor, milestoneBackgroundSelectedColor) => {
   let barTask;
   switch (task.type) {
     case "milestone":
       barTask = convertToMilestone(
         task,
         index2,
-        dates,
+        dates2,
         columnWidth,
         rowHeight,
         taskHeight,
@@ -39930,7 +39932,7 @@ const convertToBarTask = (task, index2, dates, columnWidth, rowHeight, taskHeigh
       barTask = convertToBar(
         task,
         index2,
-        dates,
+        dates2,
         columnWidth,
         rowHeight,
         taskHeight * 0.5,
@@ -39947,7 +39949,7 @@ const convertToBarTask = (task, index2, dates, columnWidth, rowHeight, taskHeigh
       barTask = convertToBar(
         task,
         index2,
-        dates,
+        dates2,
         columnWidth,
         rowHeight,
         taskHeight,
@@ -39963,15 +39965,15 @@ const convertToBarTask = (task, index2, dates, columnWidth, rowHeight, taskHeigh
   }
   return barTask;
 };
-const convertToBar = (task, index2, dates, columnWidth, rowHeight, taskHeight, barCornerRadius, handleWidth, rtl, barProgressColor, barProgressSelectedColor, barBackgroundColor, barBackgroundSelectedColor) => {
+const convertToBar = (task, index2, dates2, columnWidth, rowHeight, taskHeight, barCornerRadius, handleWidth, rtl, barProgressColor, barProgressSelectedColor, barBackgroundColor, barBackgroundSelectedColor) => {
   let x1;
   let x2;
   if (rtl) {
-    x2 = taskXCoordinateRTL(task.start, dates, columnWidth);
-    x1 = taskXCoordinateRTL(task.end, dates, columnWidth);
+    x2 = taskXCoordinateRTL(task.start, dates2, columnWidth);
+    x1 = taskXCoordinateRTL(task.end, dates2, columnWidth);
   } else {
-    x1 = taskXCoordinate(task.start, dates, columnWidth);
-    x2 = taskXCoordinate(task.end, dates, columnWidth);
+    x1 = taskXCoordinate(task.start, dates2, columnWidth);
+    x2 = taskXCoordinate(task.end, dates2, columnWidth);
   }
   let typeInternal = task.type;
   if (typeInternal === "task" && x2 - x1 < handleWidth * 2) {
@@ -40003,8 +40005,8 @@ const convertToBar = (task, index2, dates, columnWidth, rowHeight, taskHeight, b
     styles
   });
 };
-const convertToMilestone = (task, index2, dates, columnWidth, rowHeight, taskHeight, barCornerRadius, handleWidth, milestoneBackgroundColor, milestoneBackgroundSelectedColor) => {
-  const x = taskXCoordinate(task.start, dates, columnWidth);
+const convertToMilestone = (task, index2, dates2, columnWidth, rowHeight, taskHeight, barCornerRadius, handleWidth, milestoneBackgroundColor, milestoneBackgroundSelectedColor) => {
+  const x = taskXCoordinate(task.start, dates2, columnWidth);
   const y = taskYCoordinate(index2, rowHeight, taskHeight);
   const x1 = x - taskHeight * 0.5;
   const x2 = x + taskHeight * 0.5;
@@ -40033,16 +40035,16 @@ const convertToMilestone = (task, index2, dates, columnWidth, rowHeight, taskHei
     styles
   });
 };
-const taskXCoordinate = (xDate, dates, columnWidth) => {
+const taskXCoordinate = (xDate, dates2, columnWidth) => {
   var _a, _b, _c;
-  const index2 = dates.findIndex((d) => (d == null ? void 0 : d.getTime()) >= (xDate == null ? void 0 : xDate.getTime())) - 1;
-  const remainderMillis = (xDate == null ? void 0 : xDate.getTime()) - ((_a = dates[index2]) == null ? void 0 : _a.getTime());
-  const percentOfInterval = remainderMillis / (((_b = dates[index2 + 1]) == null ? void 0 : _b.getTime()) - ((_c = dates[index2]) == null ? void 0 : _c.getTime()));
+  const index2 = dates2.findIndex((d) => (d == null ? void 0 : d.getTime()) >= (xDate == null ? void 0 : xDate.getTime())) - 1;
+  const remainderMillis = (xDate == null ? void 0 : xDate.getTime()) - ((_a = dates2[index2]) == null ? void 0 : _a.getTime());
+  const percentOfInterval = remainderMillis / (((_b = dates2[index2 + 1]) == null ? void 0 : _b.getTime()) - ((_c = dates2[index2]) == null ? void 0 : _c.getTime()));
   const x = index2 * columnWidth + percentOfInterval * columnWidth;
   return isNaN(x) ? 0 : x;
 };
-const taskXCoordinateRTL = (xDate, dates, columnWidth) => {
-  let x = taskXCoordinate(xDate, dates, columnWidth);
+const taskXCoordinateRTL = (xDate, dates2, columnWidth) => {
+  let x = taskXCoordinate(xDate, dates2, columnWidth);
   x += columnWidth;
   return isNaN(x) ? 0 : x;
 };
@@ -40355,7 +40357,7 @@ const ganttDateRange = (tasks, viewMode, preStepsCount) => {
 };
 const seedDates = (startDate, endDate, viewMode) => {
   let currentDate = new Date(startDate);
-  const dates = [currentDate];
+  const dates2 = [currentDate];
   while (currentDate < endDate) {
     switch (viewMode) {
       case ViewMode.Year:
@@ -40383,9 +40385,9 @@ const seedDates = (startDate, endDate, viewMode) => {
         currentDate = addToDate(currentDate, 1, "hour");
         break;
     }
-    dates.push(currentDate);
+    dates2.push(currentDate);
   }
-  return dates;
+  return dates2;
 };
 const getLocaleMonth = (date2, locale2) => {
   let bottomValue = getCachedDateTimeFormat(locale2, {
@@ -40936,11 +40938,11 @@ const Calendar = ({
     const bottomValues2 = [];
     let weeksCount = 1;
     const topDefaultHeight = headerHeight * 0.5;
-    const dates = dateSetup.dates;
-    for (let i = dates.length - 1; i >= 0; i--) {
-      const date2 = dates[i];
+    const dates2 = dateSetup.dates;
+    for (let i = dates2.length - 1; i >= 0; i--) {
+      const date2 = dates2[i];
       let topValue = "";
-      if (i === 0 || date2.getMonth() !== dates[i - 1].getMonth()) {
+      if (i === 0 || date2.getMonth() !== dates2[i - 1].getMonth()) {
         topValue = `${getLocaleMonth(date2, locale2)}, ${date2.getFullYear()}`;
       }
       const bottomValue = `W${getWeekNumberISO8601(date2)}`;
@@ -40957,7 +40959,7 @@ const Calendar = ({
         )
       );
       if (topValue) {
-        if (i !== dates.length - 1) {
+        if (i !== dates2.length - 1) {
           topValues2.push(
             /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
               TopPartOfCalendar,
@@ -40983,9 +40985,9 @@ const Calendar = ({
     const topValues2 = [];
     const bottomValues2 = [];
     const topDefaultHeight = headerHeight * 0.5;
-    const dates = dateSetup.dates;
-    for (let i = 0; i < dates.length; i++) {
-      const date2 = dates[i];
+    const dates2 = dateSetup.dates;
+    for (let i = 0; i < dates2.length; i++) {
+      const date2 = dates2[i];
       const bottomValue = `${date2.getDate().toString()}`;
       bottomValues2.push(
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
@@ -40999,7 +41001,7 @@ const Calendar = ({
           date2.getTime()
         )
       );
-      if (i + 1 !== dates.length && date2.getMonth() !== dates[i + 1].getMonth()) {
+      if (i + 1 !== dates2.length && date2.getMonth() !== dates2[i + 1].getMonth()) {
         const topValue = getLocaleMonth(date2, locale2);
         topValues2.push(
           /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
@@ -41024,9 +41026,9 @@ const Calendar = ({
     const bottomValues2 = [];
     const ticks = viewMode === ViewMode.HalfDay ? 2 : 4;
     const topDefaultHeight = headerHeight * 0.5;
-    const dates = dateSetup.dates;
-    for (let i = 0; i < dates.length; i++) {
-      const date2 = dates[i];
+    const dates2 = dateSetup.dates;
+    for (let i = 0; i < dates2.length; i++) {
+      const date2 = dates2[i];
       const bottomValue = getCachedDateTimeFormat(locale2, {
         hour: "numeric"
       }).format(date2).replace("时", "");
@@ -41043,7 +41045,7 @@ const Calendar = ({
           date2.getTime()
         )
       );
-      if (i === 0 || date2.getDate() !== dates[i - 1].getDate()) {
+      if (i === 0 || date2.getDate() !== dates2[i - 1].getDate()) {
         const topValue = `${getLocalDayOfWeek(date2, locale2, "short")}, ${date2.getDate()} ${getLocaleMonth(
           date2,
           locale2
@@ -41071,9 +41073,9 @@ const Calendar = ({
     const topValues2 = [];
     const bottomValues2 = [];
     const topDefaultHeight = headerHeight * 0.5;
-    const dates = dateSetup.dates;
-    for (let i = 0; i < dates.length; i++) {
-      const date2 = dates[i];
+    const dates2 = dateSetup.dates;
+    for (let i = 0; i < dates2.length; i++) {
+      const date2 = dates2[i];
       const bottomValue = (_a = getCachedDateTimeFormat(locale2, {
         hour: "numeric"
       }).format(date2)) == null ? void 0 : _a.replace("时", "");
@@ -41090,8 +41092,8 @@ const Calendar = ({
           date2.getTime()
         )
       );
-      if (i !== 0 && date2.getDate() !== dates[i - 1].getDate()) {
-        const displayDate = dates[i - 1];
+      if (i !== 0 && date2.getDate() !== dates2[i - 1].getDate()) {
+        const displayDate = dates2[i - 1];
         const topValue = `${getLocalDayOfWeek(displayDate, locale2, "long")}, ${displayDate.getDate()} ${getLocaleMonth(
           displayDate,
           locale2
@@ -41183,7 +41185,7 @@ const useStyles$b = genStyleHook("nb-grid-body", (token) => {
 const empty = [{ id: (0, import_client.uid)() }, { id: (0, import_client.uid)() }, { id: (0, import_client.uid)() }];
 const GridBody = ({
   tasks,
-  dates,
+  dates: dates2,
   rowHeight,
   svgWidth,
   columnWidth,
@@ -41231,14 +41233,14 @@ const GridBody = ({
   let tickX = 0;
   const ticks = [];
   let today = /* @__PURE__ */ (0, import_jsx_runtime.jsx)("rect", {});
-  for (let i = 0; i < dates.length; i++) {
-    const date2 = dates[i];
+  for (let i = 0; i < dates2.length; i++) {
+    const date2 = dates2[i];
     ticks.push(/* @__PURE__ */ (0, import_jsx_runtime.jsx)("line", { x1: tickX, y1: 0, x2: tickX, y2: y, className: (0, import_css.cx)("gridTick") }, date2.getTime()));
-    if (i + 1 !== dates.length && date2.getTime() < now.getTime() && dates[i + 1].getTime() >= now.getTime() || // if current date is last
-    i !== 0 && i + 1 === dates.length && date2.getTime() < now.getTime() && addToDate(date2, date2.getTime() - dates[i - 1].getTime(), "millisecond").getTime() >= now.getTime()) {
+    if (i + 1 !== dates2.length && date2.getTime() < now.getTime() && dates2[i + 1].getTime() >= now.getTime() || // if current date is last
+    i !== 0 && i + 1 === dates2.length && date2.getTime() < now.getTime() && addToDate(date2, date2.getTime() - dates2[i - 1].getTime(), "millisecond").getTime() >= now.getTime()) {
       today = /* @__PURE__ */ (0, import_jsx_runtime.jsx)("rect", { x: tickX, y: 0, width: columnWidth, height: y, fill: todayColor });
     }
-    if (rtl && i + 1 !== dates.length && date2.getTime() >= now.getTime() && dates[i + 1].getTime() < now.getTime()) {
+    if (rtl && i + 1 !== dates2.length && date2.getTime() >= now.getTime() && dates2[i + 1].getTime() < now.getTime()) {
       today = /* @__PURE__ */ (0, import_jsx_runtime.jsx)("rect", { x: tickX + columnWidth, y: 0, width: columnWidth, height: y, fill: todayColor });
     }
     tickX += columnWidth;
@@ -41705,7 +41707,7 @@ let lastAction = null;
 let lastStart = null;
 const TaskGanttContent = ({
   tasks,
-  dates,
+  dates: dates2,
   ganttEvent,
   selectedTask,
   rowHeight,
@@ -41734,10 +41736,10 @@ const TaskGanttContent = ({
   const [isMoving, setIsMoving] = (0, import_react2.useState)(false);
   (0, import_react2.useEffect)(() => {
     var _a2, _b, _c, _d;
-    const dateDelta = ((_a2 = dates[1]) == null ? void 0 : _a2.getTime()) - ((_b = dates[0]) == null ? void 0 : _b.getTime()) - ((_c = dates[1]) == null ? void 0 : _c.getTimezoneOffset()) * 60 * 1e3 + ((_d = dates[0]) == null ? void 0 : _d.getTimezoneOffset()) * 60 * 1e3;
+    const dateDelta = ((_a2 = dates2[1]) == null ? void 0 : _a2.getTime()) - ((_b = dates2[0]) == null ? void 0 : _b.getTime()) - ((_c = dates2[1]) == null ? void 0 : _c.getTimezoneOffset()) * 60 * 1e3 + ((_d = dates2[0]) == null ? void 0 : _d.getTimezoneOffset()) * 60 * 1e3;
     const newXStep = timeStep * columnWidth / dateDelta;
     setXStep(newXStep);
-  }, [columnWidth, dates, timeStep]);
+  }, [columnWidth, dates2, timeStep]);
   (0, import_react2.useEffect)(() => {
     const handleMouseMove = (event) => __async(void 0, null, function* () {
       var _a2;
@@ -42152,9 +42154,9 @@ const Gantt = (props) => {
   ]);
   (0, import_react2.useEffect)(() => {
     if (viewMode === dateSetup.viewMode && (viewDate && !currentViewDate || viewDate && (currentViewDate == null ? void 0 : currentViewDate.valueOf()) !== viewDate.valueOf())) {
-      const dates = dateSetup.dates;
-      const index2 = dates.findIndex(
-        (d, i) => viewDate.valueOf() >= d.valueOf() && i + 1 !== dates.length && viewDate.valueOf() < dates[i + 1].valueOf()
+      const dates2 = dateSetup.dates;
+      const index2 = dates2.findIndex(
+        (d, i) => viewDate.valueOf() >= d.valueOf() && i + 1 !== dates2.length && viewDate.valueOf() < dates2[i + 1].valueOf()
       );
       if (index2 === -1) {
         return;
@@ -43612,7 +43614,7 @@ function IconField(props) {
   const { value, onChange, disabled } = props;
   const [visible, setVisible] = (0, import_react2.useState)(false);
   const { t } = (0, import_react_i18next.useTranslation)();
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_antd.Input.Group, { compact: true, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_antd.Space.Compact, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
       PopoverWithStopPropagation,
       {
@@ -48762,6 +48764,7 @@ const TableBlockDesigner = () => {
     },
     [dn, field.decoratorProps, fieldSchema, service]
   );
+  const api = useAPIClient();
   return (
     // fix https://nocobase.height.app/T-2259
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(RecordProvider, { parent: record, record: {}, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(GeneralSchemaDesigner, { template: template2, title: title || name, children: [
@@ -48792,18 +48795,28 @@ const TableBlockDesigner = () => {
         {
           title: t("Enable drag and drop sorting"),
           checked: field.decoratorProps.dragSort,
-          onChange: (dragSort2) => {
-            var _a2;
+          onChange: (dragSort2) => __async(void 0, null, function* () {
+            var _a2, _b2, _c2;
+            if (dragSort2 && collectionField) {
+              const { data } = yield api.resource("collections.fields", collectionField.collectionName).update({
+                filterByTk: collectionField.name,
+                values: {
+                  sortable: true
+                }
+              });
+              const sortBy = (_b2 = (_a2 = data == null ? void 0 : data.data) == null ? void 0 : _a2[0]) == null ? void 0 : _b2.sortBy;
+              fieldSchema["x-decorator-props"].dragSortBy = sortBy;
+            }
             field.decoratorProps.dragSort = dragSort2;
             fieldSchema["x-decorator-props"].dragSort = dragSort2;
-            service.run(__spreadProps(__spreadValues({}, (_a2 = service.params) == null ? void 0 : _a2[0]), { sort: "sort" }));
+            service.run(__spreadProps(__spreadValues({}, (_c2 = service.params) == null ? void 0 : _c2[0]), { sort: fieldSchema["x-decorator-props"].dragSortBy }));
             dn.emit("patch", {
               schema: {
                 ["x-uid"]: fieldSchema["x-uid"],
                 "x-decorator-props": fieldSchema["x-decorator-props"]
               }
             });
-          }
+          })
         }
       ),
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FixedBlockDesignerItem, {}),
@@ -66540,8 +66553,9 @@ const getProps = (app) => {
   if (app.ws.serverDown) {
     return {
       status: "error",
-      title: "App error",
-      subTitle: "The server is down"
+      icon: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_icons.DisconnectOutlined, {}),
+      title: "You're offline",
+      subTitle: "Please check the server status or network connection status"
     };
   }
   if (!app.error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client",
-  "version": "0.15.0-alpha.3",
+  "version": "0.15.0-alpha.5",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.mjs",
@@ -25,9 +25,9 @@
     "@formily/reactive-react": "^2.2.27",
     "@formily/shared": "^2.2.27",
     "@formily/validator": "^2.2.27",
-    "@nocobase/evaluators": "0.15.0-alpha.3",
-    "@nocobase/sdk": "0.15.0-alpha.3",
-    "@nocobase/utils": "0.15.0-alpha.3",
+    "@nocobase/evaluators": "0.15.0-alpha.5",
+    "@nocobase/sdk": "0.15.0-alpha.5",
+    "@nocobase/utils": "0.15.0-alpha.5",
     "@types/requirejs": "^2.1.34",
     "ahooks": "^3.7.2",
     "antd": "^5.8.6",
@@ -76,5 +76,5 @@
     "dumi": "^2.2.0",
     "dumi-theme-nocobase": "^0.2.14"
   },
-  "gitHead": "8f39868bd613a465efb20123094ebbc2390c1eef"
+  "gitHead": "4713b1a887dad4dadf27b65e3b3e2a46c6986cbf"
 }