@nocobase/client 2.0.14 → 2.0.16

package/es/index.mjs

@@ -875,6 +875,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get removeNullCondition() {
     return removeNullCondition;
   },
+  get resolveFilterPickerFormat() {
+    return resolveFilterPickerFormat;
+  },
   get storePopupContext() {
     return storePopupContext;
   },
@@ -4107,6 +4110,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get resolveDefaultCustomFieldOperator() {
     return resolveDefaultCustomFieldOperator;
   },
+  get resolveFilterPickerFormat() {
+    return resolveFilterPickerFormat;
+  },
   get reverseFieldProperties() {
     return reverseFieldProperties;
   },
@@ -9955,7 +9961,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version = "2.0.14", license = "Apache-2.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "2.0.16", license = "Apache-2.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.6.1",
@@ -9978,10 +9984,10 @@ const name = "@nocobase/client", version = "2.0.14", license = "Apache-2.0", mai
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "2.0.14",
-  "@nocobase/flow-engine": "2.0.14",
-  "@nocobase/sdk": "2.0.14",
-  "@nocobase/utils": "2.0.14",
+  "@nocobase/evaluators": "2.0.16",
+  "@nocobase/flow-engine": "2.0.16",
+  "@nocobase/sdk": "2.0.16",
+  "@nocobase/utils": "2.0.16",
   "@tanstack/react-table": "^8.21.3",
   "@types/tabulator-tables": "^6.2.6",
   "acorn-jsx": "^5.3.2",
@@ -14311,7 +14317,10 @@ ReadPretty$d.DateRangePicker = function(t) {
   return /* @__PURE__ */ jsx("div", { className: classNames(o, t.className), style: t.style, children: r() });
 };
 ReadPretty$d.DatePicker = withPopupWrapper(ReadPretty$d.DatePicker);
-const DatePickerContext = React.createContext({ utc: !0 }), useDatePickerContext = () => React.useContext(DatePickerContext), DatePickerProvider = DatePickerContext.Provider, InternalDatePicker = connect(DatePicker$1, mapProps(mapDatePicker()), mapReadPretty(ReadPretty$d.DatePicker)), InternalRangePicker = connect(
+const stripTimeFromFormat$3 = (e) => e && e.replace(/\s*[Hh]{1,2}:mm(?::ss)?(?:\.SSS)?(?:\s*[aA])?/g, "").trim(), resolveFilterPickerFormat = (e) => {
+  const { targetPicker: t, picker: o = "date", format: n, dateFormat: r, showTime: i, timeFormat: a } = e, l = r || n, c = t === o && l ? l : getPickerFormat(t), u = t === "date" ? stripTimeFromFormat$3(c) : c;
+  return getDateTimeFormat(t, u, i, a);
+}, DatePickerContext = React.createContext({ utc: !0 }), useDatePickerContext = () => React.useContext(DatePickerContext), DatePickerProvider = DatePickerContext.Provider, InternalDatePicker = connect(DatePicker$1, mapProps(mapDatePicker()), mapReadPretty(ReadPretty$d.DatePicker)), InternalRangePicker = connect(
   DatePicker$1.RangePicker,
   mapProps(mapRangePicker()),
   mapReadPretty(ReadPretty$d.DateRangePicker)
@@ -14363,35 +14372,42 @@ const DatePickerContext = React.createContext({ utc: !0 }), useDatePickerContext
 };
 DatePicker.ReadPretty = ReadPretty$d.DatePicker;
 DatePicker.RangePicker = function(t) {
-  const { value: o, picker: n = "date", format: r, showTime: i, timeFormat: a } = t, { t: l } = useTranslation(), c = useFieldSchema(), u = useField(), { utc: d = !0 } = useDatePickerContext(), p = getDateRanges(), m = useCompile(), h = !(c != null && c["x-filter-operator"]), g = [
-    { label: l("Today"), value: p.today },
-    { label: l("Last week"), value: p.lastWeek },
-    { label: l("This week"), value: p.thisWeek },
-    { label: l("Next week"), value: p.nextWeek },
-    { label: l("Last month"), value: p.lastMonth },
-    { label: l("This month"), value: p.thisMonth },
-    { label: l("Next month"), value: p.nextMonth },
-    { label: l("Last quarter"), value: p.lastQuarter },
-    { label: l("This quarter"), value: p.thisQuarter },
-    { label: l("Next quarter"), value: p.nextQuarter },
-    { label: l("Last year"), value: p.lastYear },
-    { label: l("This year"), value: p.thisYear },
-    { label: l("Next year"), value: p.nextYear },
-    { label: l("Last 7 days"), value: p.last7Days },
-    { label: l("Next 7 days"), value: p.next7Days },
-    { label: l("Last 30 days"), value: p.last30Days },
-    { label: l("Next 30 days"), value: p.next30Days },
-    { label: l("Last 90 days"), value: p.last90Days },
-    { label: l("Next 90 days"), value: p.next90Days }
-  ], f = o ? inferPickerType(o == null ? void 0 : o[0], n) : n, y = getPickerFormat(f) || r, b = A(x({
-    utc: d,
-    presets: g
+  const { value: o, picker: n = "date", format: r, dateFormat: i, showTime: a, timeFormat: l } = t, { t: c } = useTranslation(), u = useFieldSchema(), d = useField(), { utc: p = !0 } = useDatePickerContext(), m = getDateRanges(), h = useCompile(), g = !(u != null && u["x-filter-operator"]), f = [
+    { label: c("Today"), value: m.today },
+    { label: c("Last week"), value: m.lastWeek },
+    { label: c("This week"), value: m.thisWeek },
+    { label: c("Next week"), value: m.nextWeek },
+    { label: c("Last month"), value: m.lastMonth },
+    { label: c("This month"), value: m.thisMonth },
+    { label: c("Next month"), value: m.nextMonth },
+    { label: c("Last quarter"), value: m.lastQuarter },
+    { label: c("This quarter"), value: m.thisQuarter },
+    { label: c("Next quarter"), value: m.nextQuarter },
+    { label: c("Last year"), value: m.lastYear },
+    { label: c("This year"), value: m.thisYear },
+    { label: c("Next year"), value: m.nextYear },
+    { label: c("Last 7 days"), value: m.last7Days },
+    { label: c("Next 7 days"), value: m.next7Days },
+    { label: c("Last 30 days"), value: m.last30Days },
+    { label: c("Next 30 days"), value: m.next30Days },
+    { label: c("Last 90 days"), value: m.last90Days },
+    { label: c("Next 90 days"), value: m.next90Days }
+  ], y = o ? inferPickerType(o == null ? void 0 : o[0], n) : n, b = A(x({
+    utc: p,
+    presets: f
   }, t), {
-    format: getDateTimeFormat(f, y, i, a),
-    picker: f,
-    showTime: i ? { defaultValue: [dayjs("00:00:00", "HH:mm:ss"), dayjs("23:59:59", "HH:mm:ss")] } : !1
-  }), [S, C] = useState(b);
-  return h ? /* @__PURE__ */ jsxs(Space$1.Compact, { children: [
+    format: resolveFilterPickerFormat({
+      targetPicker: y,
+      picker: n,
+      format: r,
+      dateFormat: i,
+      showTime: a,
+      timeFormat: l
+    }),
+    picker: y,
+    showTime: a ? { defaultValue: [dayjs("00:00:00", "HH:mm:ss"), dayjs("23:59:59", "HH:mm:ss")] } : !1
+  });
+  return g ? /* @__PURE__ */ jsxs(Space$1.Compact, { children: [
     /* @__PURE__ */ jsx(
       Select$1,
       {
@@ -14399,58 +14415,71 @@ DatePicker.RangePicker = function(t) {
         "data-testid": "select-picker",
         style: { width: "100px" },
         popupMatchSelectWidth: !1,
-        defaultValue: f,
-        options: m([
+        defaultValue: y,
+        options: h([
           {
-            label: l("Date"),
+            label: c("Date"),
             value: "date"
           },
           {
-            label: l("Month"),
+            label: c("Month"),
             value: "month"
           },
           {
-            label: l("Quarter"),
+            label: c("Quarter"),
             value: "quarter"
           },
           {
-            label: l("Year"),
+            label: c("Year"),
             value: "year"
           }
         ]),
-        onChange: (F) => {
-          const P = getPickerFormat(F), v = getDateTimeFormat(F, P, i, a);
-          u == null || u.setComponentProps({
-            picker: F,
-            format: P
-          }), b.picker = F, b.format = v, C(b), c && (c["x-component-props"] = A(x({}, t), {
-            picker: F,
-            format: v
-          })), u && (u.value = void 0);
+        onChange: (S) => {
+          const C = getPickerFormat(S), F = getDateTimeFormat(S, C, a, l);
+          d == null || d.setComponentProps({
+            picker: S,
+            dateFormat: C,
+            format: F
+          }), u && (u["x-component-props"] = A(x({}, t), {
+            picker: S,
+            dateFormat: C,
+            format: F
+          })), d && (d.value = void 0);
         }
       }
     ),
-    /* @__PURE__ */ jsx(InternalRangePicker, A(x({}, S), { value: o }))
+    /* @__PURE__ */ jsx(InternalRangePicker, A(x({}, b), { value: o }))
   ] }) : /* @__PURE__ */ jsx(InternalRangePicker, x({}, b));
 };
 function toLocalNaiveISOString(e, t) {
   return e && e.endsWith("Z") ? dayjs(e).format(t) : e;
 }
 DatePicker.FilterWithPicker = function(t) {
-  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 = useFieldSchema(), d = c ? inferPickerType(c, o) : o, [p, m] = useState(d), h = getPickerFormat(d) || n, { t: g } = useTranslation(), f = A(x({
-    utc: l,
-    inputReadOnly: a
+  const { picker: o = "date", format: n, dateFormat: r, showTime: i, timeFormat: a } = t, l = isMobile(), { utc: c = !0 } = useDatePickerContext(), u = Array.isArray(t.value) ? t.value[0] : t.value, d = useFieldSchema(), p = u ? inferPickerType(u, o) : o, [m, h] = useState(p), { t: g } = useTranslation();
+  useEffect(() => {
+    h(p);
+  }, [p]);
+  const f = A(x({
+    utc: c,
+    inputReadOnly: l
   }, t), {
     underFilter: !0,
-    showTime: r ? { defaultValue: dayjs("00:00:00", "HH:mm:ss") } : !1,
-    format: getDateTimeFormat(p, h, r, i),
-    picker: p,
-    onChange: (C) => {
+    showTime: i ? { defaultValue: dayjs("00:00:00", "HH:mm:ss") } : !1,
+    format: resolveFilterPickerFormat({
+      targetPicker: m,
+      picker: o,
+      format: n,
+      dateFormat: r,
+      showTime: i,
+      timeFormat: a
+    }),
+    picker: m,
+    onChange: (b) => {
       t.onChange(void 0), setTimeout(() => {
-        t.onChange(C);
+        t.onChange(b);
       });
     }
-  }), y = useField(), [b, S] = useState(f);
+  }), y = useField();
   return /* @__PURE__ */ jsxs(Space$1.Compact, { style: { width: "100%" }, children: [
     /* @__PURE__ */ jsx(
       Select$1,
@@ -14459,7 +14488,7 @@ DatePicker.FilterWithPicker = function(t) {
         "data-testid": "select-picker",
         style: { width: "100px" },
         popupMatchSelectWidth: !1,
-        value: p,
+        value: m,
         options: [
           {
             label: g("Date"),
@@ -14478,25 +14507,22 @@ DatePicker.FilterWithPicker = function(t) {
             value: "year"
           }
         ],
-        onChange: (C) => {
-          m(C);
-          const F = getPickerFormat(C), P = getDateTimeFormat(C, F, r, i);
+        onChange: (b) => {
+          h(b);
+          const S = getPickerFormat(b), C = getDateTimeFormat(b, S, i, a);
           y == null || y.setComponentProps({
-            picker: C,
-            format: F
-          }), f.picker = C, f.format = P, S(f), u != null && u["x-component-props"] && (u["x-component-props"] = A(x({}, t), {
-            picker: C,
-            format: P
+            picker: b,
+            dateFormat: S,
+            format: C
+          }), d != null && d["x-component-props"] && (d["x-component-props"] = A(x({}, t), {
+            picker: b,
+            dateFormat: S,
+            format: C
           })), y && (y.value = null);
         }
       }
     ),
-    /* @__PURE__ */ jsx(
-      InternalDatePicker,
-      A(x({}, b), {
-        value: toLocalNaiveISOString(c, getDateTimeFormat(p, h, r, i))
-      })
-    )
+    /* @__PURE__ */ jsx(InternalDatePicker, A(x({}, f), { value: toLocalNaiveISOString(u, f.format) }))
   ] });
 };
 const useDateVariable = ({ operator: e, schema: t, noDisabled: o }) => {
@@ -32252,7 +32278,10 @@ function SchemaSettingsConnectDataBlocks(e) {
         title: f,
         value: (S == null ? void 0 : S.field) || "",
         options: [
-          ...getSupportFieldsByAssociation(m(a.name), g).map((C) => ({
+          ...getSupportFieldsByAssociation(
+            m(a.name, a.dataSource),
+            g
+          ).map((C) => ({
             label: p(C.uiSchema.title) || C.name,
             value: `${C.name}.${getTargetKey(C)}`
           })),
@@ -72521,8 +72550,9 @@ class BlockModel extends FlowModel {
    * @returns 'auto' | 'manual'
    */
   getDataLoadingMode() {
-    var o;
-    return ((o = this.getStepParams("dataLoadingModeSettings")) == null ? void 0 : o.mode) || "auto";
+    var n;
+    const o = this.getStepParams("dataLoadingModeSettings");
+    return ((n = o == null ? void 0 : o.dataLoadingMode) == null ? void 0 : n.mode) || "auto";
   }
   static _getScene() {
     return _.castArray(this.scene || []);
@@ -91957,9 +91987,13 @@ const HighPerformanceTable = React.memo(
               .ant-table-tbody > tr > td.ant-table-selection-column {
                 padding-left: 32px !important;
               }
-            ` : void 0;
-      return classNames(M, T);
-    }, [t.props.dragSort, t.props.dragSortBy]);
+            ` : void 0, w = d != null && d.y ? css`
+            .ant-table-body {
+              min-height: ${d.y}px;
+            }
+          ` : void 0;
+      return classNames(M, T, w);
+    }, [t.props.dragSort, t.props.dragSortBy, d == null ? void 0 : d.y]);
     return /* @__PURE__ */ jsx(
       MemoizedTable,
       {
@@ -96861,7 +96895,7 @@ const titleField = defineAction({
     if (!o)
       return;
     const n = o.resource;
-    n instanceof MultiRecordResource && (o.setStepParams("dataLoadingModeSettings", { mode: t.mode }), t.mode === "manual" && !o.hasActiveFilters() ? (n.setData([]), n.setMeta({ count: 0, hasNext: !1 }), typeof n.setPage == "function" && n.setPage(1), n.loading = !1) : t.mode === "auto" && n.refresh());
+    n instanceof MultiRecordResource && (t.mode === "manual" && !o.hasActiveFilters() ? (n.setData([]), n.setMeta({ count: 0, hasNext: !1 }), typeof n.setPage == "function" && n.setPage(1), n.loading = !1) : t.mode === "auto" && n.refresh());
   }
 }), renderMode = defineAction({
   title: tExpr("Render mode"),
@@ -108478,6 +108512,7 @@ export {
   required,
   resolveCustomFieldOperatorList,
   resolveDefaultCustomFieldOperator,
+  resolveFilterPickerFormat,
   reverseFieldProperties,
   runjs,
   schemaSettingsLabelLayout,

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

@@ -10,6 +10,32 @@ import React from 'react';
 interface IDatePickerProps {
     utc?: boolean;
 }
+/**
+ * 解析筛选日期组件的展示格式。
+ *
+ * 这里优先使用 schema 上显式配置的 dateFormat / format，
+ * 只有在当前 picker 没有自定义格式时才回退到默认 picker 格式。
+ *
+ * @param options 当前筛选日期组件的格式参数
+ * @returns 适用于当前 picker 的最终展示格式
+ * @example
+ * ```typescript
+ * resolveFilterPickerFormat({
+ *   targetPicker: 'date',
+ *   picker: 'date',
+ *   dateFormat: 'MM/DD/YY',
+ *   showTime: false,
+ * });
+ * ```
+ */
+export declare const resolveFilterPickerFormat: (options: {
+    targetPicker: string;
+    picker?: string;
+    format?: string;
+    dateFormat?: string;
+    showTime?: boolean;
+    timeFormat?: string;
+}) => any;
 export declare const useDatePickerContext: () => IDatePickerProps;
 export declare const DatePickerProvider: React.Provider<IDatePickerProps>;
 export declare const DatePicker: {