@nocobase/client 1.4.23 → 1.4.25

package/es/index.mjs

@@ -113,6 +113,7 @@ import dayjs from "dayjs";
 import LRUCache from "lru-cache";
 import { PageHeader } from "@ant-design/pro-layout";
 import { useHotkeys } from "react-hotkeys-hook";
+import { usePrefixCls as usePrefixCls$1, dayjsable, formatDayjsValue } from "@formily/antd-v5/esm/__builtins__";
 import * as dndKitAccessibility from "@dnd-kit/accessibility";
 import * as dndKitModifiers from "@dnd-kit/modifiers";
 import * as dndKitSortable from "@dnd-kit/sortable";
@@ -124,7 +125,6 @@ import * as formilyValidator from "@formily/validator";
 import { registerValidateRules, setValidateLanguage } from "@formily/validator";
 import axios from "axios";
 import * as ReactRouter from "react-router";
-import { usePrefixCls as usePrefixCls$1, dayjsable, formatDayjsValue } from "@formily/antd-v5/esm/__builtins__";
 import JSON5 from "json5";
 import { Helmet } from "react-helmet";
 import relativeTime from "dayjs/plugin/relativeTime";
@@ -754,6 +754,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get isFileCollection() {
     return isFileCollection;
   },
+  get isMobile() {
+    return isMobile;
+  },
   get isShowFilePicker() {
     return isShowFilePicker;
   },
@@ -2817,6 +2820,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get isInitializersSame() {
     return isInitializersSame;
   },
+  get isMobile() {
+    return isMobile;
+  },
   get isPatternDisabled() {
     return isPatternDisabled;
   },
@@ -4295,7 +4301,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version$1 = "1.4.23", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version$1 = "1.4.25", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
   "@ahooksjs/use-url-state": "3.5.1",
   "@ant-design/cssinjs": "^1.11.1",
   "@ant-design/icons": "^5.1.4",
@@ -4317,9 +4323,9 @@ const name = "@nocobase/client", version$1 = "1.4.23", license = "AGPL-3.0", mai
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.4.23",
-  "@nocobase/sdk": "1.4.23",
-  "@nocobase/utils": "1.4.23",
+  "@nocobase/evaluators": "1.4.25",
+  "@nocobase/sdk": "1.4.25",
+  "@nocobase/utils": "1.4.25",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -7065,25 +7071,33 @@ const REGEX_OF_VARIABLE = /^\s*\{\{\s*([a-zA-Z0-9_$-.]+?)\s*\}\}\s*$/g, REGEX_OF
   }
   return r ? dayjs(e).format(a) : dayjs(e).startOf(n).format(a);
 }, mapDatePicker = function() {
-  return (e) => {
-    const { dateOnly: t, showTime: o, picker: n = "date", utc: r, gmt: i, underFilter: a } = e, l = getDefaultFormat(e), c = e.onChange;
-    return v(x({}, e), {
-      format: l,
-      value: str2moment(e.value, e),
-      onChange: (u, d) => {
-        c && c(a ? handleChangeOnFilter(u, n, o) : handleDateChangeOnForm(u, t, r, n, o, i));
+  const e = isMobile();
+  return (t) => {
+    const { dateOnly: o, showTime: n, picker: r = "date", utc: i, gmt: a, underFilter: l } = t, c = getDefaultFormat(t), u = t.onChange;
+    return v(x({}, t), {
+      inputReadOnly: e,
+      format: c,
+      value: str2moment(t.value, t),
+      onChange: (d, p) => {
+        u && u(l ? handleChangeOnFilter(d, r, n) : handleDateChangeOnForm(d, o, i, r, n, a));
       }
     });
   };
-}, mapRangePicker = function() {
-  return (e) => {
-    const t = getDefaultFormat(e), o = e.onChange, { dateOnly: n, showTime: r, picker: i = "date", utc: a, gmt: l, underFilter: c } = e;
-    return v(x({}, e), {
-      format: t,
-      value: str2moment(e.value, e),
-      onChange: (u) => {
-        o && o(
-          c ? u ? [handleChangeOnFilter(u[0], i, r), handleChangeOnFilter(u[1], i, r)] : [] : u ? [moment2str(getRangeStart(u[0], e), e), moment2str(getRangeEnd(u[1], e), e)] : []
+};
+function isMobile() {
+  return window.matchMedia("(max-width: 768px)").matches;
+}
+const mapRangePicker = function() {
+  const e = isMobile();
+  return (t) => {
+    const o = getDefaultFormat(t), n = t.onChange, { dateOnly: r, showTime: i, picker: a = "date", utc: l, gmt: c, underFilter: u } = t;
+    return v(x({}, t), {
+      format: o,
+      value: str2moment(t.value, t),
+      inputReadOnly: e,
+      onChange: (d) => {
+        n && n(
+          u ? d ? [handleChangeOnFilter(d[0], a, i), handleChangeOnFilter(d[1], a, i)] : [] : d ? [moment2str(getRangeStart(d[0], t), t), moment2str(getRangeEnd(d[1], t), t)] : []
         );
       }
     });
@@ -10775,19 +10789,20 @@ DatePicker.RangePicker = function(t) {
   ] }) : /* @__PURE__ */ jsx(InternalRangePicker, x({}, S));
 };
 DatePicker.FilterWithPicker = function(t) {
-  const { picker: o = "date", format: n, showTime: r, timeFormat: i } = t, { utc: a = !0 } = useDatePickerContext(), l = Array.isArray(t.value) ? t.value[0] : t.value, c = useCompile(), u = useFieldSchema(), d = l ? inferPickerType(l) : o, p = getPickerFormat(d) || n, m = v(x({
-    utc: a
+  const { picker: o = "date", format: n, showTime: r, timeFormat: i } = t, a = isMobile(), { utc: l = !0 } = useDatePickerContext(), c = Array.isArray(t.value) ? t.value[0] : t.value, u = useCompile(), d = useFieldSchema(), p = c ? inferPickerType(c) : o, m = getPickerFormat(p) || n, h = v(x({
+    utc: l,
+    inputReadOnly: a
   }, t), {
     underFilter: !0,
     showTime: r ? { defaultValue: dayjs("00:00:00", "HH:mm:ss") } : !1,
-    format: getDateTimeFormat(d, p, r, i),
-    picker: d,
-    onChange: (C) => {
+    format: getDateTimeFormat(p, m, r, i),
+    picker: p,
+    onChange: (S) => {
       t.onChange(void 0), setTimeout(() => {
-        t.onChange(C);
+        t.onChange(S);
       });
     }
-  }), h = useField(), [g, f] = useState(m);
+  }), g = useField(), [f, C] = useState(h);
   return /* @__PURE__ */ jsxs(Space$1.Compact, { children: [
     /* @__PURE__ */ jsx(
       Select$1,
@@ -10796,8 +10811,8 @@ DatePicker.FilterWithPicker = function(t) {
         "data-testid": "select-picker",
         style: { width: "100px" },
         popupMatchSelectWidth: !1,
-        defaultValue: d,
-        options: c([
+        defaultValue: p,
+        options: u([
           {
             label: '{{t("Date")}}',
             value: "date"
@@ -10815,19 +10830,19 @@ DatePicker.FilterWithPicker = function(t) {
             value: "year"
           }
         ]),
-        onChange: (C) => {
-          const S = getPickerFormat(C), b = getDateTimeFormat(C, S, r, i);
-          h.setComponentProps({
-            picker: C,
-            format: S
-          }), m.picker = C, m.format = b, f(m), u["x-component-props"] = v(x({}, t), {
-            picker: C,
+        onChange: (S) => {
+          const b = getPickerFormat(S), y = getDateTimeFormat(S, b, r, i);
+          g.setComponentProps({
+            picker: S,
             format: b
-          }), h.value = null;
+          }), h.picker = S, h.format = y, C(h), d["x-component-props"] = v(x({}, t), {
+            picker: S,
+            format: y
+          }), g.value = null;
         }
       }
     ),
-    /* @__PURE__ */ jsx(InternalDatePicker, v(x({}, g), { value: l }))
+    /* @__PURE__ */ jsx(InternalDatePicker, v(x({}, f), { value: c }))
   ] });
 };
 const useDateVariable = ({ operator: e, schema: t, noDisabled: o }) => {
@@ -22099,8 +22114,8 @@ const SchemaSettingsWrapper = (e) => {
   }
 `, TableColumnActionBar$1 = observer$1(
   (e) => {
-    const t = useDesigner(), { isInSubTable: o } = useFlag() || {};
-    return /* @__PURE__ */ jsxs(
+    const t = useDesigner(), { isInSubTable: o } = useFlag() || {}, { designable: n } = useSchemaComponentContext();
+    return !n || t.isNullComponent ? e.children : /* @__PURE__ */ jsxs(
       SortableItem,
       {
         className: designerCss$4({
@@ -22146,21 +22161,27 @@ const useColumnSchema$1 = () => {
   }, [e, t]);
   return t ? o : [];
 }, TableColumnDecorator$1 = (e) => {
-  const t = useDesigner(), o = useField(), { fieldSchema: n, uiSchema: r, collectionField: i } = useColumnSchema$1(), a = useCompile(), { isInSubTable: l } = useFlag() || {};
+  const t = useDesigner(), o = useField(), { fieldSchema: n, uiSchema: r, collectionField: i } = useColumnSchema$1(), { designable: a } = useSchemaComponentContext(), l = useCompile(), { isInSubTable: c } = useFlag() || {};
   return useLayoutEffect(() => {
     o.title || n && r != null && r.title && (o.title = r == null ? void 0 : r.title);
-  }, [r == null ? void 0 : r.title]), /* @__PURE__ */ jsx(
+  }, [r == null ? void 0 : r.title]), !a || t.isNullComponent ? /* @__PURE__ */ jsxs(CollectionFieldContext.Provider, { value: i, children: [
+    /* @__PURE__ */ jsx(t, { fieldSchema: n, uiSchema: r, collectionField: i }),
+    /* @__PURE__ */ jsxs("span", { role: "button", children: [
+      (n == null ? void 0 : n.required) && /* @__PURE__ */ jsx("span", { className: "ant-formily-item-asterisk", children: "*" }),
+      /* @__PURE__ */ jsx("span", { children: (o == null ? void 0 : o.title) || l(r == null ? void 0 : r.title) })
+    ] })
+  ] }) : /* @__PURE__ */ jsx(
     SortableItem,
     {
       className: designerCss$4({
-        margin: l ? "-12px -8px" : "-18px -16px",
-        padding: l ? "12px 8px" : "12px 16px"
+        margin: c ? "-12px -8px" : "-18px -16px",
+        padding: c ? "12px 8px" : "12px 16px"
       }),
       children: /* @__PURE__ */ jsxs(CollectionFieldContext.Provider, { value: i, children: [
         /* @__PURE__ */ jsx(t, { fieldSchema: n, uiSchema: r, collectionField: i }),
         /* @__PURE__ */ jsxs("span", { role: "button", children: [
           (n == null ? void 0 : n.required) && /* @__PURE__ */ jsx("span", { className: "ant-formily-item-asterisk", children: "*" }),
-          /* @__PURE__ */ jsx("span", { children: (o == null ? void 0 : o.title) || a(r == null ? void 0 : r.title) })
+          /* @__PURE__ */ jsx("span", { children: (o == null ? void 0 : o.title) || l(r == null ? void 0 : r.title) })
         ] })
       ] })
     }
@@ -25418,7 +25439,8 @@ const getAppends = ({
         "AssociationField.Selector",
         "AssociationField.AddNewer",
         "TableField",
-        "Kanban.CardViewer"
+        "Kanban.CardViewer",
+        "Action.Container"
       ].includes(c["x-component"]) || getAppends({
         schema: c,
         prefix: t,
@@ -33456,7 +33478,9 @@ class SchemaSettingsPlugin extends Plugin {
     });
   }
 }
-const DefaultSchemaToolbar = () => null, useDesigner = () => {
+const DefaultSchemaToolbar = () => null;
+DefaultSchemaToolbar.isNullComponent = !0;
+const useDesigner = () => {
   const { designable: e } = useDesignable(), t = useFieldSchema(), o = useMemo(() => t["x-designer"] || t["x-toolbar"] ? t["x-designer"] || t["x-toolbar"] : t["x-settings"] ? SchemaToolbar : DefaultSchemaToolbar, [t]), n = useComponent(o);
   return e && n || DefaultSchemaToolbar;
 }, useFieldProps = (e) => {
@@ -38419,9 +38443,6 @@ const useColumnsDeepMemoized = (e) => {
                   .ant-table-cell-fix-right {
                     padding: 8px 16px !important;
                   }
-                  .ant-table-thead .ant-table-cell {
-                    padding: 8px 16px;
-                  }
                 }
               }
             }
@@ -38775,7 +38796,7 @@ const Table$1 = withDynamicSchemaProps(
           field: o,
           showIndex: !0,
           dragSort: !1,
-          showDel: C !== !1 || f !== !1 || S !== !1 ? ($) => o.editable ? S !== !1 ? !0 : $ == null ? void 0 : $.__isNewRecord__ : !1 : !1,
+          showDel: o.editable && (C !== !1 || f !== !1 || S !== !1) ? ($) => o.editable ? S !== !1 ? !0 : $ == null ? void 0 : $.__isNewRecord__ : !1 : !1,
           pagination: L,
           rowSelection: { type: "none", hideSelectAll: !0 },
           footer: () => o.editable && /* @__PURE__ */ jsxs(Fragment, { children: [
@@ -40849,10 +40870,13 @@ function toSafeNumber(e) {
   return e && (e > Number.MAX_SAFE_INTEGER || e < Number.MIN_SAFE_INTEGER ? new BigNumber(e).toString() : Number(e));
 }
 const InputNumber = connect((e) => {
-  const r = e, { onChange: t } = r, o = K(r, ["onChange"]);
-  return /* @__PURE__ */ jsx(InputNumber$1, x({ onChange: (i) => {
-    Number.isNaN(i) ? t(null) : t(toSafeNumber(i));
-  } }, o));
+  const i = e, { onChange: t } = i, o = K(i, ["onChange"]);
+  let r = x({
+    onChange: (a) => {
+      Number.isNaN(a) ? t(null) : t(toSafeNumber(a));
+    }
+  }, o);
+  return o.formatStyle && (r = omit$1(r, ["addonAfter", "addonBefore"])), /* @__PURE__ */ jsx(InputNumber$1, x({}, r));
 }, mapReadPretty(ReadPretty$2));
 InputNumber.ReadPretty = ReadPretty$2;
 const ListBlockContext = createContext({});
@@ -54944,7 +54968,7 @@ function PluginInfo(e) {
         `,
         actions: [
           /* @__PURE__ */ jsxs(Space$1, { split: /* @__PURE__ */ jsx(Divider$1, { type: "vertical" }), children: [
-            /* @__PURE__ */ jsxs(
+            g && /* @__PURE__ */ jsxs(
               "a",
               {
                 href: g,
@@ -62247,6 +62271,7 @@ export {
   isFileCollection,
   isInFilterFormBlock,
   isInitializersSame,
+  isMobile,
   isPatternDisabled,
   isSameCollection,
   isShowFilePicker,

package/es/schema-component/antd/date-picker/util.d.ts

@@ -16,6 +16,7 @@ export interface Moment2strOptions {
 export declare const moment2str: (value?: Dayjs | null, options?: Moment2strOptions) => any;
 export declare const handleDateChangeOnForm: (value: any, dateOnly: any, utc: any, picker: any, showTime: any, gmt: any) => any;
 export declare const mapDatePicker: () => (props: any) => any;
+export declare function isMobile(): boolean;
 export declare const mapRangePicker: () => (props: any) => any;
 export declare const getDateRanges: (props?: {
     /** 日期是否是 UTC 格式 */

package/es/schema-component/antd/table-v2/Table.Column.ActionBar.d.ts

@@ -11,4 +11,4 @@ export declare const designerCss: ({ margin, padding }?: {
     margin?: string;
     padding?: string;
 }) => string;
-export declare const TableColumnActionBar: React.MemoExoticComponent<import("@formily/react").ReactFC<unknown>>;
+export declare const TableColumnActionBar: React.MemoExoticComponent<import("@formily/react").ReactFC<Omit<any, "ref">>>;