@nocobase/client 2.0.43 → 2.0.44

package/es/flow/models/blocks/table/TableColumnModel.d.ts

@@ -21,7 +21,9 @@ export declare class TableColumnModel extends DisplayItemModel {
     afterAddAsSubModel(): Promise<void>;
     renderHiddenInConfig(): React.ReactNode | undefined;
     static defineChildren(ctx: FlowModelContext): any;
-    getColumnProps(): TableColumnProps;
+    getColumnProps(): TableColumnProps & {
+        sortField?: string;
+    };
     onInit(options: any): void;
     renderItem(): any;
 }

package/es/flow/models/blocks/table/sortUtils.d.ts

@@ -0,0 +1,32 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+type AssociationTitleFieldModel = {
+    fieldPath?: string;
+    props?: {
+        dataIndex?: string;
+        titleField?: string;
+    };
+    collectionField?: {
+        name?: string;
+        targetCollectionTitleFieldName?: string;
+        isAssociationField?: () => boolean;
+    };
+    getStepParams?: (flowKey: string, stepKey: string) => {
+        label?: string;
+    } | undefined;
+};
+export declare function getSavedAssociationTitleField(model: AssociationTitleFieldModel): string;
+export declare function getTableColumnSortField(model: AssociationTitleFieldModel): string;
+export declare function resolveTableSorterField(sorter: {
+    field?: string;
+    column?: {
+        sortField?: string;
+    };
+}): string;
+export {};

package/es/index.mjs

@@ -9979,7 +9979,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version = "2.0.43", 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.44", 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",
@@ -10002,10 +10002,10 @@ const name = "@nocobase/client", version = "2.0.43", 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.43",
-  "@nocobase/flow-engine": "2.0.43",
-  "@nocobase/sdk": "2.0.43",
-  "@nocobase/utils": "2.0.43",
+  "@nocobase/evaluators": "2.0.44",
+  "@nocobase/flow-engine": "2.0.44",
+  "@nocobase/sdk": "2.0.44",
+  "@nocobase/utils": "2.0.44",
   "@tanstack/react-table": "^8.21.3",
   "@types/tabulator-tables": "^6.2.6",
   "acorn-jsx": "^5.3.2",
@@ -30647,7 +30647,7 @@ const useStyles$a = genStyleHook("nb-markdown", (e, { isDarkTheme: t }) => {
     }, t ? i : r)
   };
 }), parseMarkdown$1 = _.memoize((e) => L(void 0, null, function* () {
-  return e && (yield import("./md-oH2RssNY.mjs")).default.render(e);
+  return e && (yield import("./md-BbvRKckr.mjs")).default.render(e);
 }));
 function useParseMarkdown$1(e) {
   const [t, o] = useState(""), [n, r] = useState(!0);
@@ -72079,7 +72079,7 @@ BlockGridModel.registerFlow({
   }
 });
 const parseMarkdown = _.memoize((e) => L(void 0, null, function* () {
-  return e && (yield import("./md-BbvRKckr.mjs")).default.render(e);
+  return e && (yield import("./md-oH2RssNY.mjs")).default.render(e);
 }));
 function useParseMarkdown(e) {
   const [t, o] = useState(""), [n, r] = useState(!0);
@@ -83945,6 +83945,22 @@ const useBlockHeight = ({ heightMode: e, tableAreaRef: t, deps: o = [] }) => {
     return u.observe(a), l && u.observe(l), c && u.observe(c), () => u.disconnect();
   }, [i, t, ...o]), n;
 };
+function getSavedAssociationTitleField(e) {
+  var t, o, n;
+  return ((o = (t = e.getStepParams) == null ? void 0 : t.call(e, "tableColumnSettings", "fieldNames")) == null ? void 0 : o.label) || ((n = e.props) == null ? void 0 : n.titleField);
+}
+function getTableColumnSortField(e) {
+  var r, i, a, l;
+  const t = e.fieldPath || ((r = e.collectionField) == null ? void 0 : r.name) || ((i = e.props) == null ? void 0 : i.dataIndex);
+  if (!((l = (a = e.collectionField) == null ? void 0 : a.isAssociationField) != null && l.call(a)))
+    return t;
+  const o = e.collectionField.name || e.fieldPath, n = getSavedAssociationTitleField(e) || e.collectionField.targetCollectionTitleFieldName;
+  return !o || !n ? t : `${o}.${n}`;
+}
+function resolveTableSorterField(e) {
+  var t;
+  return ((t = e == null ? void 0 : e.column) == null ? void 0 : t.sortField) || (e == null ? void 0 : e.field);
+}
 function FieldDeletePlaceholder(e) {
   const { t } = useTranslation(), o = useFlowModel(), n = o.context.blockModel, r = (e == null ? void 0 : e.collection) || n.collection, i = r.dataSource, a = o.props.title || o.fieldPath, l = useMemo(() => {
     const u = `${t(i.displayName || i.key)} > `, d = r ? `${t(r.title) || r.name || r.tableName} > ` : "";
@@ -83997,12 +84013,7 @@ const CustomWidth = ({ setOpen: e, t, handleChange: o, defaultValue: n }) => {
       ] })
     }
   );
-};
-function getSavedAssociationTitleField(e) {
-  var t, o, n;
-  return ((o = (t = e.getStepParams) == null ? void 0 : t.call(e, "tableColumnSettings", "fieldNames")) == null ? void 0 : o.label) || ((n = e.props) == null ? void 0 : n.titleField);
-}
-const Ze = class Ze extends DisplayItemModel {
+}, Ze = class Ze extends DisplayItemModel {
   afterAddAsSubModel() {
     return L(this, null, function* () {
       yield $e(Ze.prototype, this, "afterAddAsSubModel").call(this), yield this.dispatchEvent("beforeRender");
@@ -84082,6 +84093,7 @@ const Ze = class Ze extends DisplayItemModel {
       }
     ) }), o = this.render();
     return I(x({}, this.props), {
+      sortField: getTableColumnSortField(this),
       ellipsis: !0,
       title: this.props.tooltip ? /* @__PURE__ */ jsxs("span", { style: { display: "inline-flex", alignItems: "center", gap: 4 }, children: [
         t,
@@ -84280,7 +84292,8 @@ TableColumnModel.registerFlow({
       title: tExpr("Sortable"),
       uiMode: { type: "switch", key: "sorter" },
       hideInSettings: (e) => L(void 0, null, function* () {
-        return !e.model.collectionField.getInterfaceOptions().sortable || e.associationModel;
+        var o, n;
+        return !e.model.collectionField.getInterfaceOptions().sortable || ((n = (o = e.collectionField) == null ? void 0 : o.isAssociationField) == null ? void 0 : n.call(o)) || !!e.model.associationPathName || e.associationModel;
       }),
       defaultParams: {
         sorter: !1
@@ -92482,10 +92495,10 @@ const HighPerformanceTable = React.memo(
       renderCell: t.renderCell
     }, t.rowSelectionProps), [t, m]), y = useCallback(
       (D, T, w) => L(void 0, null, function* () {
-        const B = t.props.globalSort, $ = t.resource.getSort(), j = $ != null && $.length ? $ : B, O = w.order ? w.order === "ascend" ? [w.field] : [`-${w.field}`] : j;
-        if (w && t.resource.setSort(O), t.resource.getPageSize() !== D.pageSize ? t.resource.setPage(1) : t.resource.setPage(D.current), t.resource.loading = !0, t.resource.setPageSize(D.pageSize), yield t.resource.refresh(), c) {
-          const V = extractIds(t.resource.getData());
-          F(V);
+        const B = t.props.globalSort, $ = t.resource.getSort(), j = $ != null && $.length ? $ : B, O = resolveTableSorterField(w), V = w.order && O ? w.order === "ascend" ? [O] : [`-${O}`] : j;
+        if (w && t.resource.setSort(V), t.resource.getPageSize() !== D.pageSize ? t.resource.setPage(1) : t.resource.setPage(D.current), t.resource.loading = !0, t.resource.setPageSize(D.pageSize), yield t.resource.refresh(), c) {
+          const z = extractIds(t.resource.getData());
+          F(z);
         }
       }),
       [t, c]