@nocobase/client 1.4.24 → 1.4.26

package/es/collection-manager/templates/sql.d.ts

@@ -17,17 +17,6 @@ export declare class SqlCollectionTemplate extends CollectionTemplate {
         fields: any[];
     };
     configurableProperties: {
-        filterTargetKey: {
-            title: string;
-            type: string;
-            description: string;
-            'x-decorator': string;
-            'x-component': string;
-            'x-component-props': {
-                multiple: boolean;
-            };
-            'x-reactions': string[];
-        };
         name: any;
         title: any;
         description: any;
@@ -84,5 +73,16 @@ export declare class SqlCollectionTemplate extends CollectionTemplate {
                 };
             };
         };
+        filterTargetKey: {
+            title: string;
+            type: string;
+            description: string;
+            'x-decorator': string;
+            'x-component': string;
+            'x-component-props': {
+                multiple: boolean;
+            };
+            'x-reactions': string[];
+        };
     };
 }

package/es/index.mjs

@@ -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.24", 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.26", 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.24", 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.24",
-  "@nocobase/sdk": "1.4.24",
-  "@nocobase/utils": "1.4.24",
+  "@nocobase/evaluators": "1.4.26",
+  "@nocobase/sdk": "1.4.26",
+  "@nocobase/utils": "1.4.26",
   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)] : []
         );
       }
     });
@@ -10698,8 +10712,7 @@ const DatePickerContext = React.createContext({ utc: !0 }), useDatePickerContext
   const { utc: t = !0 } = useDatePickerContext(), o = Array.isArray(e.value) ? e.value[0] : e.value, n = v(x({
     utc: t
   }, e), {
-    showTime: e.showTime ? { defaultValue: dayjs("00:00:00", "HH:mm:ss") } : !1,
-    inputReadOnly: !0
+    showTime: e.showTime ? { defaultValue: dayjs("00:00:00", "HH:mm:ss") } : !1
   });
   return /* @__PURE__ */ jsx(InternalDatePicker, v(x({}, n), { value: o }));
 };
@@ -10731,8 +10744,7 @@ DatePicker.RangePicker = function(t) {
   }, t), {
     format: getDateTimeFormat(f, C, i, a),
     picker: f,
-    showTime: i ? { defaultValue: [dayjs("00:00:00", "HH:mm:ss"), dayjs("23:59:59", "HH:mm:ss")] } : !1,
-    inputReadOnly: !0
+    showTime: i ? { defaultValue: [dayjs("00:00:00", "HH:mm:ss"), dayjs("23:59:59", "HH:mm:ss")] } : !1
   }), [b, y] = useState(S);
   return h ? /* @__PURE__ */ jsxs(Space$1.Compact, { children: [
     /* @__PURE__ */ jsx(
@@ -10777,20 +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,
-    inputReadOnly: !0,
-    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,
@@ -10799,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"
@@ -10818,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 }) => {
@@ -52612,7 +52624,7 @@ class SqlCollectionTemplate extends CollectionTemplate {
     P(this, "default", {
       fields: []
     });
-    P(this, "configurableProperties", v(x({
+    P(this, "configurableProperties", x({
       title: {
         type: "string",
         title: '{{ t("Collection display name") }}',
@@ -52666,8 +52678,7 @@ class SqlCollectionTemplate extends CollectionTemplate {
             "x-component": PreviewTable
           }
         }
-      }
-    }, getConfigurableProperties("category")), {
+      },
       filterTargetKey: {
         title: '{{ t("Record unique key")}}',
         type: "single",
@@ -52679,7 +52690,7 @@ class SqlCollectionTemplate extends CollectionTemplate {
         },
         "x-reactions": ["{{useAsyncDataSource(loadFilterTargetKeys)}}"]
       }
-    }));
+    }, getConfigurableProperties("category", "description")));
   }
 }
 class MainDataSource extends DataSource {
@@ -54956,7 +54967,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,
@@ -62259,6 +62270,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 格式 */