@nocobase/client 1.5.0-beta.18 → 1.5.0-beta.19

package/es/index.mjs

@@ -73,7 +73,7 @@ import * as nocobaseSDK from "@nocobase/sdk";
 import { APIClient as APIClient$1, getSubAppName } from "@nocobase/sdk";
 import cloneDeep from "lodash/cloneDeep";
 import * as nocobaseClientUtils from "@nocobase/utils/client";
-import { isPlainObject, tval as tval$1, flatten, getValuesByPath, getDefaultFormat, str2moment, toGmt, toLocal, getPickerFormat, Handlebars, dayjs as dayjs$1, uid as uid$1, error, isPortalInBody, forEach, unflatten as unflatten$1, isURL, parse, nextTick, toFixedByStep, parseHTML } from "@nocobase/utils/client";
+import { isPlainObject, tval as tval$1, flatten, getValuesByPath, getDefaultFormat, str2moment, toGmt, toLocal, getPickerFormat, Handlebars, dayjs as dayjs$1, uid as uid$1, error, isPortalInBody, forEach, getDateTimeFormat, unflatten as unflatten$1, isURL, parse, nextTick, toFixedByStep, parseHTML } from "@nocobase/utils/client";
 import deepmerge from "deepmerge";
 import uniq$1 from "lodash/uniq";
 import * as formilyJsonReactive from "@formily/reactive";
@@ -10112,7 +10112,7 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: n, filterProper
                 return spliceArrayState(o, {
                   startIndex: R,
                   deleteCount: T
-                }), o.value.splice(R, T), o.setInitialValue(o.value), o.onInput(o.value);
+                }), o.value.splice(R, T), o.setInitialValue([...o.value]), o.onInput(o.value);
               }),
               children: /* @__PURE__ */ jsx(CloseOutlined, { style: { cursor: "pointer", color: "gray" } })
             }
@@ -19226,35 +19226,35 @@ const DatePickerContext = React.createContext({ utc: !0 }), useDatePickerContext
 };
 DatePicker.ReadPretty = ReadPretty$d.DatePicker;
 DatePicker.RangePicker = function e(t) {
-  const { value: n, picker: o = "date", format: r } = t, { t: i } = useTranslation(), a = useFieldSchema(), l = useField(), { utc: c = !0 } = useDatePickerContext(), u = getDateRanges(), d = useCompile(), p = !a["x-filter-operator"], m = [
-    { label: i("Today"), value: u.today },
-    { label: i("Last week"), value: u.lastWeek },
-    { label: i("This week"), value: u.thisWeek },
-    { label: i("Next week"), value: u.nextWeek },
-    { label: i("Last month"), value: u.lastMonth },
-    { label: i("This month"), value: u.thisMonth },
-    { label: i("Next month"), value: u.nextMonth },
-    { label: i("Last quarter"), value: u.lastQuarter },
-    { label: i("This quarter"), value: u.thisQuarter },
-    { label: i("Next quarter"), value: u.nextQuarter },
-    { label: i("Last year"), value: u.lastYear },
-    { label: i("This year"), value: u.thisYear },
-    { label: i("Next year"), value: u.nextYear },
-    { label: i("Last 7 days"), value: u.last7Days },
-    { label: i("Next 7 days"), value: u.next7Days },
-    { label: i("Last 30 days"), value: u.last30Days },
-    { label: i("Next 30 days"), value: u.next30Days },
-    { label: i("Last 90 days"), value: u.last90Days },
-    { label: i("Next 90 days"), value: u.next90Days }
-  ], h = n ? inferPickerType(n == null ? void 0 : n[0]) : o, g = getPickerFormat(h) || r, f = P(x({
-    utc: c,
-    presets: m
+  const { value: n, picker: o = "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["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 = n ? inferPickerType(n == null ? void 0 : n[0]) : o, C = getPickerFormat(f) || r, b = P(x({
+    utc: d,
+    presets: g
   }, t), {
-    format: g,
-    picker: h,
-    showTime: t.showTime ? { defaultValue: [dayjs("00:00:00", "HH:mm:ss"), dayjs("00:00:00", "HH:mm:ss")] } : !1
-  }), [C, b] = useState(f);
-  return p ? /* @__PURE__ */ jsxs(Space$1.Compact, { children: [
+    format: getDateTimeFormat(f, C, i, a),
+    picker: f,
+    showTime: i ? { defaultValue: [dayjs("00:00:00", "HH:mm:ss"), dayjs("00:00:00", "HH:mm:ss")] } : !1
+  }), [y, S] = useState(b);
+  return h ? /* @__PURE__ */ jsxs(Space$1.Compact, { children: [
     /* @__PURE__ */ jsx(
       Select$1,
       {
@@ -19262,8 +19262,8 @@ DatePicker.RangePicker = function e(t) {
         "data-testid": "select-picker",
         style: { width: "100px" },
         popupMatchSelectWidth: !1,
-        defaultValue: h,
-        options: d([
+        defaultValue: f,
+        options: m([
           {
             label: '{{t("Date")}}',
             value: "date"
@@ -19281,35 +19281,35 @@ DatePicker.RangePicker = function e(t) {
             value: "year"
           }
         ]),
-        onChange: (y) => {
-          const S = getPickerFormat(y);
-          l.setComponentProps({
-            picker: y,
-            format: S
-          }), f.picker = y, f.format = S, b(f), a["x-component-props"] = P(x({}, t), {
-            picker: y,
-            format: S
-          }), l.value = void 0;
+        onChange: (v) => {
+          const F = getPickerFormat(v), I = getDateTimeFormat(v, F, i, a);
+          u.setComponentProps({
+            picker: v,
+            format: F
+          }), b.picker = v, b.format = I, S(b), c["x-component-props"] = P(x({}, t), {
+            picker: v,
+            format: I
+          }), u.value = void 0;
         }
       }
     ),
-    /* @__PURE__ */ jsx(InternalRangePicker, P(x({}, C), { value: n }))
-  ] }) : /* @__PURE__ */ jsx(InternalRangePicker, x({}, f));
+    /* @__PURE__ */ jsx(InternalRangePicker, P(x({}, y), { value: n }))
+  ] }) : /* @__PURE__ */ jsx(InternalRangePicker, x({}, b));
 };
 DatePicker.FilterWithPicker = function e(t) {
-  const { picker: n = "date", format: o } = t, { utc: r = !0 } = useDatePickerContext(), i = Array.isArray(t.value) ? t.value[0] : t.value, a = useCompile(), l = useFieldSchema(), c = i ? inferPickerType(i) : n, u = getPickerFormat(c) || o, d = P(x({
-    utc: r
+  const { picker: n = "date", format: o, 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) : n, p = getPickerFormat(d) || o, m = P(x({
+    utc: a
   }, t), {
     underFilter: !0,
-    showTime: t.showTime ? { defaultValue: dayjs("00:00:00", "HH:mm:ss") } : !1,
-    format: u,
-    picker: c,
-    onChange: (g) => {
+    showTime: r ? { defaultValue: dayjs("00:00:00", "HH:mm:ss") } : !1,
+    format: getDateTimeFormat(d, p, r, i),
+    picker: d,
+    onChange: (C) => {
       t.onChange(void 0), setTimeout(() => {
-        t.onChange(g);
+        t.onChange(C);
       });
     }
-  }), p = useField(), [m, h] = useState(d);
+  }), h = useField(), [g, f] = useState(m);
   return /* @__PURE__ */ jsxs(Space$1.Compact, { children: [
     /* @__PURE__ */ jsx(
       Select$1,
@@ -19318,8 +19318,8 @@ DatePicker.FilterWithPicker = function e(t) {
         "data-testid": "select-picker",
         style: { width: "100px" },
         popupMatchSelectWidth: !1,
-        defaultValue: c,
-        options: a([
+        defaultValue: d,
+        options: c([
           {
             label: '{{t("Date")}}',
             value: "date"
@@ -19337,19 +19337,19 @@ DatePicker.FilterWithPicker = function e(t) {
             value: "year"
           }
         ]),
-        onChange: (g) => {
-          const f = getPickerFormat(g);
-          p.setComponentProps({
-            picker: g,
-            format: f
-          }), d.picker = g, d.format = f, h(d), l["x-component-props"] = P(x({}, t), {
-            picker: g,
-            format: f
-          }), p.value = null;
+        onChange: (C) => {
+          const b = getPickerFormat(C), y = getDateTimeFormat(C, b, r, i);
+          h.setComponentProps({
+            picker: C,
+            format: b
+          }), m.picker = C, m.format = y, f(m), u["x-component-props"] = P(x({}, t), {
+            picker: C,
+            format: y
+          }), h.value = null;
         }
       }
     ),
-    /* @__PURE__ */ jsx(InternalDatePicker, P(x({}, m), { value: i }))
+    /* @__PURE__ */ jsx(InternalDatePicker, P(x({}, g), { value: l }))
   ] });
 };
 const useDateVariable = ({ operator: e, schema: t, noDisabled: n }) => {
@@ -34936,7 +34936,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.5.0-beta.18", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.5.0-beta.19", 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",
@@ -34958,9 +34958,9 @@ const name = "@nocobase/client", version = "1.5.0-beta.18", license = "AGPL-3.0"
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.5.0-beta.18",
-  "@nocobase/sdk": "1.5.0-beta.18",
-  "@nocobase/utils": "1.5.0-beta.18",
+  "@nocobase/evaluators": "1.5.0-beta.19",
+  "@nocobase/sdk": "1.5.0-beta.19",
+  "@nocobase/utils": "1.5.0-beta.19",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -39454,15 +39454,7 @@ const getSourceData = (e, t) => {
   return r === !1 ? b : /* @__PURE__ */ jsx(PopupVisibleProvider, { visible: !1, children: /* @__PURE__ */ jsxs(ActionContextProvider, { value: y, children: [
     b,
     h && // The recordData here is only provided when the popup is opened, not the current row record
-    /* @__PURE__ */ jsx(VariablePopupRecordProvider, { children: /* @__PURE__ */ jsx(WithoutTableFieldResource.Provider, { value: !0, children: /* @__PURE__ */ jsx(
-      NocoBaseRecursionField,
-      {
-        schema: o,
-        onlyRenderProperties: !0,
-        basePath: l.address,
-        filterProperties: (v) => v["x-component"] === "AssociationField.Viewer"
-      }
-    ) }) })
+    /* @__PURE__ */ jsx(VariablePopupRecordProvider, { children: /* @__PURE__ */ jsx(WithoutTableFieldResource.Provider, { value: !0, children: /* @__PURE__ */ jsx(NocoBaseRecursionField, { schema: o, onlyRenderProperties: !0, basePath: l.address }) }) })
   ] }) });
 }, InternalPopoverNesterContentCss = css`
   min-width: 600px;