@nocobase/client 2.0.0-alpha.34 → 2.0.0-alpha.35

package/es/flow/actions/setTargetDataScope.d.ts

@@ -6,4 +6,5 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-export declare const setTargetDataScope: import("@nocobase/flow-engine").ActionDefinition<import("@nocobase/flow-engine").FlowModel<import("@nocobase/flow-engine").DefaultStructure>, import("@nocobase/flow-engine").FlowContext>;
+import { FlowModel } from '@nocobase/flow-engine';
+export declare const setTargetDataScope: import("@nocobase/flow-engine").ActionDefinition<FlowModel<import("@nocobase/flow-engine").DefaultStructure>, import("@nocobase/flow-engine").FlowContext>;

package/es/flow/components/filter/FilterGroup.d.ts

@@ -6,8 +6,7 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import React, { FC } from 'react';
-import { AntdIconProps } from '@ant-design/icons/lib/components/AntdIcon';
+import React, { FC, ReactNode } from 'react';
 /**
  * 筛选项组件的属性接口
  */
@@ -26,7 +25,7 @@ interface FilterGroupProps {
     value: Record<string, any>;
     /** 自定义筛选项组件 */
     FilterItem?: React.FC<FilterItemProps>;
-    CloseIcon?: React.FC<AntdIconProps>;
+    closeIcon?: ReactNode;
     /** 是否显示边框 */
     showBorder?: boolean;
     /** 移除当前组的回调 */

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

@@ -13,7 +13,6 @@ export declare class JSColumnModel extends TableCustomColumnModel {
     renderHiddenInConfig(): React.JSX.Element;
     getInputArgs(): {};
     getColumnProps(): {
-        width: number;
         title: React.JSX.Element;
         render: (value: any, record: any, index: any) => React.JSX.Element;
     };

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

@@ -11,7 +11,6 @@ import { TableCustomColumnModel } from './TableCustomColumnModel';
 export declare class TableActionsColumnModel extends TableCustomColumnModel {
     afterAddAsSubModel(): Promise<void>;
     getColumnProps(): {
-        width: number;
         title: React.JSX.Element;
         render: (value: any, record: any, index: any) => React.JSX.Element;
     };

package/es/index.mjs

@@ -9613,7 +9613,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version = "2.0.0-alpha.34", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "2.0.0-alpha.35", 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",
@@ -9636,10 +9636,10 @@ const name = "@nocobase/client", version = "2.0.0-alpha.34", license = "AGPL-3.0
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "2.0.0-alpha.34",
-  "@nocobase/flow-engine": "2.0.0-alpha.34",
-  "@nocobase/sdk": "2.0.0-alpha.34",
-  "@nocobase/utils": "2.0.0-alpha.34",
+  "@nocobase/evaluators": "2.0.0-alpha.35",
+  "@nocobase/flow-engine": "2.0.0-alpha.35",
+  "@nocobase/sdk": "2.0.0-alpha.35",
+  "@nocobase/utils": "2.0.0-alpha.35",
   "@tanstack/react-table": "^8.21.3",
   "@types/tabulator-tables": "^6.2.6",
   "acorn-jsx": "^5.3.2",
@@ -30043,7 +30043,7 @@ const useStyles$a = genStyleHook("nb-markdown", (e, { isDarkTheme: t }) => {
     }, t ? i : r)
   };
 }), parseMarkdown$1 = _.memoize((e) => O(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);
@@ -31008,21 +31008,21 @@ const useCreateActionProps = () => {
     onReset: h
   };
 }, useDetailsPaginationProps = () => {
-  var n, r, i, a, l, c, u, d, p, m, h, g, x, b, y;
-  const e = useDetailsBlockContext(), t = ((i = (r = (n = e.service) == null ? void 0 : n.data) == null ? void 0 : r.meta) == null ? void 0 : i.count) || 0, o = (c = (l = (a = e.service) == null ? void 0 : a.data) == null ? void 0 : l.meta) == null ? void 0 : c.page;
+  var r, i, a, l, c, u, d, p, m, h, g, x, b, y, C, v, S;
+  const e = useDetailsBlockContext(), t = ((a = (i = (r = e.service) == null ? void 0 : r.data) == null ? void 0 : i.meta) == null ? void 0 : a.count) || 0, o = (u = (c = (l = e.service) == null ? void 0 : l.data) == null ? void 0 : c.meta) == null ? void 0 : u.page, { hasNext: n } = ((p = (d = e.service) == null ? void 0 : d.data) == null ? void 0 : p.meta) || {};
   if (!t && o) {
-    let v;
+    let P;
     return {
       simple: !0,
-      current: ((p = (d = (u = e.service) == null ? void 0 : u.data) == null ? void 0 : d.meta) == null ? void 0 : p.page) || 1,
+      current: ((g = (h = (m = e.service) == null ? void 0 : m.data) == null ? void 0 : h.meta) == null ? void 0 : g.page) || 1,
       pageSize: 1,
       showSizeChanger: !1,
       align: "center",
-      onChange(S) {
+      onChange(T) {
         return O(this, null, function* () {
-          var P, T;
-          const F = (T = (P = e.service) == null ? void 0 : P.params) == null ? void 0 : T[0];
-          e.service.run(I(f({}, F), { page: S }));
+          var D, j;
+          const A = (j = (D = e.service) == null ? void 0 : D.params) == null ? void 0 : j[0];
+          e.service.run(I(f({}, A), { page: T }));
         });
       },
       style: {
@@ -31031,7 +31031,7 @@ const useCreateActionProps = () => {
       },
       showTotal: !1,
       showTitle: !1,
-      total: (g = (h = (m = e.service) == null ? void 0 : m.data) == null ? void 0 : h.data) != null && g.length ? 1 * o + 1 : 1 * o,
+      total: ((y = (b = (x = e.service) == null ? void 0 : x.data) == null ? void 0 : b.data) == null ? void 0 : y.length) < 1 || !n ? 1 * o : 1 * o + 1,
       className: css`
         .ant-pagination-simple-pager {
           display: none !important;
@@ -31042,16 +31042,16 @@ const useCreateActionProps = () => {
   return {
     simple: !0,
     hidden: t <= 1,
-    current: ((y = (b = (x = e.service) == null ? void 0 : x.data) == null ? void 0 : b.meta) == null ? void 0 : y.page) || 1,
+    current: ((S = (v = (C = e.service) == null ? void 0 : C.data) == null ? void 0 : v.meta) == null ? void 0 : S.page) || 1,
     total: t,
     pageSize: 1,
     showSizeChanger: !1,
     align: "center",
-    onChange(v) {
+    onChange(P) {
       return O(this, null, function* () {
-        var F, P;
-        const S = (P = (F = e.service) == null ? void 0 : F.params) == null ? void 0 : P[0];
-        e.service.run(I(f({}, S), { page: v }));
+        var A, D;
+        const T = (D = (A = e.service) == null ? void 0 : A.params) == null ? void 0 : D[0];
+        e.service.run(I(f({}, T), { page: P }));
       });
     },
     style: {
@@ -65334,7 +65334,7 @@ const BlockConfigsContext = createContext({
       showBorder: n = !1,
       onRemove: r,
       onChange: i,
-      CloseIcon: a = CloseCircleOutlined
+      closeIcon: a = /* @__PURE__ */ jsx(CloseCircleOutlined, {})
     } = e, { token: l } = theme.useToken(), { t: c } = useTranslation();
     t.logic || (t.logic = "$and"), Array.isArray(t.items) || (t.items = []);
     const { logic: u, items: d } = t, p = n ? {
@@ -65363,18 +65363,22 @@ const BlockConfigsContext = createContext({
       d.splice(C, 1), i == null || i(t);
     }, b = (C) => "path" in C || "operator" in C || "value" in C, y = (C) => "logic" in C && "items" in C;
     return /* @__PURE__ */ jsxs("div", { style: p, children: [
-      n && r && /* @__PURE__ */ jsx("span", { role: "button", "aria-label": "icon-close", children: /* @__PURE__ */ jsx(
-        a,
+      n && r && /* @__PURE__ */ jsx(
+        "span",
         {
+          role: "button",
+          "aria-label": "icon-close",
           style: {
             position: "absolute",
             right: 10,
             top: 10,
-            color: l.colorIcon
+            color: l.colorIcon,
+            cursor: "pointer"
           },
-          onClick: r
+          onClick: r,
+          children: a
         }
-      ) }),
+      ),
       /* @__PURE__ */ jsx("div", { style: { marginBottom: 8, color: l.colorText }, children: /* @__PURE__ */ jsxs("span", { children: [
         c("Meet"),
         " ",
@@ -65412,8 +65416,15 @@ const BlockConfigsContext = createContext({
           {
             role: "button",
             "aria-label": "icon-close",
-            style: { marginLeft: 8, marginRight: 8, flex: "0 0 auto" },
-            children: /* @__PURE__ */ jsx(a, { onClick: () => x(v), style: { color: l.colorIcon } })
+            style: {
+              marginLeft: 8,
+              marginRight: 8,
+              flex: "0 0 auto",
+              color: l.colorIcon,
+              cursor: "pointer"
+            },
+            onClick: () => x(v),
+            children: a
           }
         )
       ] }) }, v) : /* @__PURE__ */ jsx("div", { style: { marginBottom: 8, display: "flex", alignItems: "flex-end" }, children: /* @__PURE__ */ jsxs(Space$1, { style: { flex: 1, minWidth: 0 }, children: [
@@ -65429,8 +65440,15 @@ const BlockConfigsContext = createContext({
           {
             role: "button",
             "aria-label": "icon-close",
-            style: { marginLeft: 8, marginRight: 8, flex: "0 0 auto" },
-            children: /* @__PURE__ */ jsx(a, { onClick: () => x(v), style: { color: l.colorIcon } })
+            style: {
+              marginLeft: 8,
+              marginRight: 8,
+              flex: "0 0 auto",
+              color: l.colorIcon,
+              cursor: "pointer"
+            },
+            onClick: () => x(v),
+            children: a
           }
         )
       ] }) }, v) : /* @__PURE__ */ jsx("div", { style: { marginBottom: 8, display: "flex", alignItems: "flex-end" }, children: /* @__PURE__ */ jsxs(Space$1, { style: { flex: 1, minWidth: 0 }, children: [
@@ -65440,8 +65458,15 @@ const BlockConfigsContext = createContext({
           {
             role: "button",
             "aria-label": "icon-close",
-            style: { marginLeft: 8, marginRight: 8, flex: "0 0 auto" },
-            children: /* @__PURE__ */ jsx(a, { onClick: () => x(v), style: { color: l.colorIcon } })
+            style: {
+              marginLeft: 8,
+              marginRight: 8,
+              flex: "0 0 auto",
+              color: l.colorIcon,
+              cursor: "pointer"
+            },
+            onClick: () => x(v),
+            children: a
           }
         )
       ] }) }, v)) }),
@@ -67549,7 +67574,7 @@ BlockGridModel.registerFlow({
   }
 });
 const parseMarkdown = _.memoize((e) => O(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);
@@ -75068,7 +75093,7 @@ TableCustomColumnModel.registerFlow({
         }
       },
       defaultParams: {
-        width: 100
+        width: 200
       },
       handler(e, t) {
         e.model.setProps("width", t.width);
@@ -75175,7 +75200,6 @@ class TableActionsColumnModel extends TableCustomColumnModel {
       }
     ) });
     return I(f({}, this.props), {
-      width: 100,
       title: this.props.tooltip ? /* @__PURE__ */ jsxs("span", { style: { display: "inline-flex", alignItems: "center", gap: 4 }, children: [
         t,
         /* @__PURE__ */ jsx(Tooltip, { title: this.props.tooltip, children: /* @__PURE__ */ jsx(QuestionCircleOutlined, { style: { cursor: "pointer" } }) })
@@ -75184,7 +75208,26 @@ class TableActionsColumnModel extends TableCustomColumnModel {
     });
   }
   render() {
-    return (t, o, n) => /* @__PURE__ */ jsx(Columns, { record: o, model: this, index: n });
+    return (t, o, n) => {
+      var r;
+      return /* @__PURE__ */ jsx(
+        "div",
+        {
+          className: css`
+          width: ${this.props.width - 8}px;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          overflow: hidden;
+          transition: overflow 0.3s ease 0.8s; /* 加入延迟 */
+
+          &:hover {
+            overflow: ${(r = this.flowEngine.flowSettings) != null && r.enabled ? "visible" : "hidden"}; /* 鼠标悬停时，内容可见 */
+          }
+        `,
+          children: /* @__PURE__ */ jsx(Columns, { record: o, model: this, index: n })
+        }
+      );
+    };
   }
 }
 TableActionsColumnModel.define({
@@ -75893,7 +75936,7 @@ const De = class De extends DisplayItemModel {
       onCell: (r, i) => ({
         record: r,
         recordIndex: i,
-        width: this.props.width,
+        width: this.props.width - 16,
         editable: this.props.editable,
         dataIndex: this.props.dataIndex,
         title: this.props.title,
@@ -76202,7 +76245,6 @@ class JSColumnModel extends TableCustomColumnModel {
       }
     ) });
     return this.hidden && !this.flowEngine.flowSettings.enabled ? null : I(f({}, this.props), {
-      width: 100,
       title: this.props.tooltip ? /* @__PURE__ */ jsxs("span", { style: { display: "inline-flex", alignItems: "center", gap: 4 }, children: [
         r,
         /* @__PURE__ */ jsx(Tooltip, { title: this.props.tooltip, children: /* @__PURE__ */ jsx(QuestionCircleOutlined, { style: { cursor: "pointer" } }) })
@@ -76236,7 +76278,13 @@ class JSColumnModel extends TableCustomColumnModel {
         return React.useEffect(() => {
           const i = o;
           r != null && r.current && (i.__mountedOnce ? o.rerender() : i.__mountedOnce = !0);
-        }, [r == null ? void 0 : r.current]), /* @__PURE__ */ jsx("span", { ref: r, style: { display: "inline-block", maxWidth: "100%" } });
+        }, [r == null ? void 0 : r.current]), /* @__PURE__ */ jsx(
+          "div",
+          {
+            style: { width: this.props.width - 8, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" },
+            children: /* @__PURE__ */ jsx("span", { ref: r, style: { maxWidth: "100%" } })
+          }
+        );
       };
       n.displayName = "JSColumnModelStableRenderer", this._RenderComponent = n;
     }
@@ -82093,14 +82141,13 @@ const setTargetDataScope = defineAction({
       const o = t.targetBlockUid;
       if (!o)
         return;
-      const n = e.engine.getModel(o, !0);
-      if (!n)
-        return;
-      const r = n.resource;
-      if (!r)
-        return;
-      const i = pruneFilter(transformFilter(t.filter));
-      isEmptyFilter(i) ? r.removeFilterGroup(`setTargetDataScope_${e.model.uid}`) : r.addFilterGroup(`setTargetDataScope_${e.model.uid}`, i);
+      e.model.scheduleModelOperation(o, (r) => {
+        const i = r.resource;
+        if (!i)
+          return;
+        const a = pruneFilter(transformFilter(t.filter));
+        isEmptyFilter(a) ? i.removeFilterGroup(`setTargetDataScope_${e.model.uid}`) : i.addFilterGroup(`setTargetDataScope_${e.model.uid}`, a);
+      });
     });
   }
 });