@nocobase/client 1.3.23-beta → 1.3.24-beta

package/es/index.mjs

@@ -4101,7 +4101,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version$1 = "1.3.23-beta", 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.3.24-beta", 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",
@@ -4122,9 +4122,9 @@ const name = "@nocobase/client", version$1 = "1.3.23-beta", license = "AGPL-3.0"
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.3.23-beta",
-  "@nocobase/sdk": "1.3.23-beta",
-  "@nocobase/utils": "1.3.23-beta",
+  "@nocobase/evaluators": "1.3.24-beta",
+  "@nocobase/sdk": "1.3.24-beta",
+  "@nocobase/utils": "1.3.24-beta",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.4.5",
@@ -6307,13 +6307,12 @@ function getRenderContent(e, t, o, n, r) {
   return z(this, null, function* () {
     if (t && e === "handlebars")
       try {
-        try {
-          yield replaceVariableValue(t, o, n);
-        } catch (c) {
-          return null;
-        }
-        const i = Handlebars.compile(t), a = getVariablesData(n), l = i(g(g({}, o.ctxRef.current), a));
-        return yield r(l);
+        const i = Handlebars.compile(t), a = getVariablesData(n), { $nDate: l } = o.ctxRef.current, c = {};
+        Object.keys(l).map((d) => {
+          c[d] = l[d]();
+        });
+        const u = i(F(g(g({}, o.ctxRef.current), a), { $nDate: c }));
+        return yield r(u);
       } catch (i) {
         return console.log(i), t;
       }
@@ -17720,7 +17719,7 @@ const SchemaSettingsDefaultValue = function e(t) {
           type: "switch",
           useVisible() {
             const e = useCollection(), { collectionField: t } = useColumnSchema$1(), { getInterface: o } = useCollectionManager_deprecated(), n = o(t == null ? void 0 : t.interface), { currentMode: r } = useAssociationFieldContext();
-            return (n == null ? void 0 : n.sortable) === !0 && !r && (e == null ? void 0 : e.name) === (t == null ? void 0 : t.collectionName);
+            return (n == null ? void 0 : n.sortable) === !0 && !r && ((e == null ? void 0 : e.name) === (t == null ? void 0 : t.collectionName) || !(t != null && t.collectionName));
           },
           useComponentProps() {
             const e = useField(), { t } = useTranslation(), o = useFieldSchema(), { dn: n } = useDesignable();