@nocobase/client 1.6.0 → 1.6.2

package/es/index.mjs

@@ -9151,13 +9151,13 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.6.0", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.6.2", 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.6.1",
   "@ant-design/pro-layout": "^7.22.1",
   "@antv/g2plot": "^2.4.18",
-  "@budibase/handlebars-helpers": "^0.14.0",
+  "@budibase/handlebars-helpers": "0.14.0",
   "@ctrl/tinycolor": "^3.6.0",
   "@dnd-kit/core": "^5.0.1",
   "@dnd-kit/modifiers": "^6.0.0",
@@ -9173,9 +9173,9 @@ const name = "@nocobase/client", version = "1.6.0", license = "AGPL-3.0", main =
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.6.0",
-  "@nocobase/sdk": "1.6.0",
-  "@nocobase/utils": "1.6.0",
+  "@nocobase/evaluators": "1.6.2",
+  "@nocobase/sdk": "1.6.2",
+  "@nocobase/utils": "1.6.2",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -11308,6 +11308,8 @@ function getPopupContextFromActionOrAssociationFieldSchema(e) {
 }
 const popupsContextStorage = {}, getStoredPopupContext = (e) => popupsContextStorage[e], storePopupContext = (e, t) => {
   popupsContextStorage[e] = t;
+}, deletePopupContext = (e) => {
+  delete popupsContextStorage[e];
 }, blockServicesStorage = {}, getBlockService = (e) => blockServicesStorage[e], storeBlockService = (e, t) => {
   blockServicesStorage[e] = t;
 }, getPopupParamsFromPath = _.memoize((e) => e.split("/popups/").filter(Boolean).map((o) => {
@@ -11429,8 +11431,15 @@ ${JSON.stringify(L, null, 2)}`
   ), N = useCallback(() => {
     if (!f())
       return I == null ? void 0 : I(!1);
-    t(withSearchParams(removeLastPopupPath(o.pathname)), { replace: !0 }), removePopupLayerState(g);
-  }, [f, I, t, o == null ? void 0 : o.pathname, g]), j = useCallback(
+    t(withSearchParams(removeLastPopupPath(o.pathname)), { replace: !0 }), removePopupLayerState(g), m != null && m.popupuid && deletePopupContext(m.popupuid);
+  }, [
+    f,
+    I,
+    t,
+    o == null ? void 0 : o.pathname,
+    g,
+    m == null ? void 0 : m.popupuid
+  ]), j = useCallback(
     (R) => {
       const M = v(), $ = w({
         tabKey: R,
@@ -13712,7 +13721,7 @@ function getOperators() {
       return Array.isArray(r) ? !r.some((a) => (a || "").includes(i)) : (r = r || "", !r.includes(i));
     },
     $anyOf: function(r, i) {
-      return r.length === 0 ? !1 : Array.isArray(r) && Array.isArray(i) && r.some((a) => Array.isArray(a)) ? r.some((a) => a.some((l) => i.includes(l))) : r.some((a) => i.includes(a));
+      return r == null || r.length === 0 ? !1 : Array.isArray(r) && Array.isArray(i) && r.some((a) => Array.isArray(a)) ? r.some((a) => a.some((l) => i.includes(l))) : r.some((a) => i.includes(a));
     },
     $noneOf: function(r, i) {
       return !r || (r == null ? void 0 : r.length) === 0 ? !0 : Array.isArray(r) && Array.isArray(i) && r.some((a) => Array.isArray(a)) ? r.some((a) => a.every((l) => !i.some((c) => l.includes(c)))) : i.some((a) => !r.includes(a));
@@ -18525,10 +18534,10 @@ const DatePickerContext = React.createContext({ utc: !0 }), useDatePickerContext
     let m = e._minDate ? Promise.resolve(dayjs(e._minDate)) : Promise.resolve(null), g = e._maxDate ? Promise.resolve(dayjs(e._maxDate)) : Promise.resolve(null);
     isVariable$1(e._maxDate) && (g = n(e._maxDate, r).then((v) => dayjs(v.value))), isVariable$1(e._minDate) && (m = n(e._minDate, r).then((v) => dayjs(v.value)));
     const [h, f] = yield Promise.all([m, g]), C = Array.from({ length: 60 }, (v, y) => y), b = (v) => {
-      if (!v || !h && !f)
+      if (!dayjs.isDayjs(v))
         return !1;
-      const y = dayjs(v);
-      return y.isBefore(h, "minute") || y.isAfter(f, "minute");
+      const y = dayjs(v), F = h ? dayjs(h) : null, I = f ? dayjs(f).endOf("day") : null;
+      return F && y.isBefore(F, "minute") || I && y.isAfter(I, "minute");
     }, S = (v) => {
       if (!v || !h && !f)
         return { disabledHours: () => [], disabledMinutes: () => [], disabledSeconds: () => [] };
@@ -18543,7 +18552,9 @@ const DatePickerContext = React.createContext({ utc: !0 }), useDatePickerContext
       };
     };
     a(() => b), c(() => S);
-  }), p = P(x({
+  });
+  console.log(i);
+  const p = P(x({
     utc: t
   }, e), {
     disabledDate: i,
@@ -50001,7 +50012,7 @@ const useColumnsDeepMemoized = (e) => {
         render: (N, j) => {
           var R;
           const O = (R = n.value) == null ? void 0 : R.indexOf(j), B = n.address.concat(j.__index || O);
-          return /* @__PURE__ */ jsx(SubFormProvider, { value: { value: j, collection: f, fieldSchema: r.parent }, children: /* @__PURE__ */ jsx(RecordIndexProvider, { index: j.__index || O, children: /* @__PURE__ */ jsx(RecordProvider, { isNew: isNewRecord(j), record: j, parent: u, children: /* @__PURE__ */ jsx(ColumnFieldProvider, { schema: S, basePath: B, children: /* @__PURE__ */ jsx("span", { role: "button", className: h, children: /* @__PURE__ */ jsx(RecursionField, { basePath: B, schema: S, onlyRenderProperties: !0 }) }) }) }) }) });
+          return /* @__PURE__ */ jsx(SubFormProvider, { value: { value: j, collection: f, fieldSchema: r.parent }, children: /* @__PURE__ */ jsx(RecordIndexProvider, { index: j.__index || O, children: /* @__PURE__ */ jsx(RecordProvider, { isNew: isNewRecord(j), record: j, parent: u, children: /* @__PURE__ */ jsx(ColumnFieldProvider, { schema: S, basePath: B, children: /* @__PURE__ */ jsx("span", { role: "button", className: h, children: /* @__PURE__ */ jsx(RecursionField, { basePath: B, schema: S, onlyRenderProperties: !0 }) }, O) }) }) }) });
         },
         onCell: (N, j) => ({
           record: N,

package/es/schema-component/antd/page/pagePopupUtils.d.ts

@@ -49,6 +49,7 @@ export declare const getStoredPopupContext: (popupUid: string) => PopupContextSt
  * @param params
  */
 export declare const storePopupContext: (popupUid: string, params: PopupContextStorage) => void;
+export declare const deletePopupContext: (popupUid: string) => void;
 export declare const getBlockService: (popupUid: string) => {
     service: any;
 };