@nocobase/client 2.0.0-alpha.5 → 2.0.0-alpha.7

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

@@ -0,0 +1,10 @@
+/**
+ * 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.
+ */
+import { FlowModel } from '@nocobase/flow-engine';
+export declare const fixed: import("@nocobase/flow-engine").ActionDefinition<FlowModel<import("@nocobase/flow-engine").DefaultStructure>, import("@nocobase/flow-engine").FlowContext>;

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

@@ -21,6 +21,7 @@ export * from './fieldComponent';
 export * from './aclCheck';
 export * from './pattern';
 export * from './validation';
+export * from './columnFixed';
 export { fieldLinkageRules, detailsFieldLinkageRules, linkageSetDetailsFieldProps, actionLinkageRules, blockLinkageRules, linkageSetBlockProps, linkageSetActionProps, linkageSetFieldProps, linkageAssignField, linkageRunjs, } from './linkageRules';
 export { displayFieldComponent } from './displayFieldComponent';
 export * from './overflowMode';

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

@@ -36,7 +36,7 @@ export declare class TableBlockModel extends CollectionBlockModel<TableBlockMode
     customModelClasses: CustomTableBlockModelClassesEnum;
     get resource(): MultiRecordResource<any>;
     createResource(ctx: any, params: any): MultiRecordResource<unknown>;
-    getColumns(): import("antd").TableColumnProps<import("antd/es/_util/type").AnyObject>[];
+    getColumns(): any[];
     EditableRow: (props: any) => React.JSX.Element;
     EditableCell: React.MemoExoticComponent<import("@formily/reactive-react").ReactFC<Omit<any, "ref">>>;
     components: {

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

@@ -7,3 +7,4 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 export declare function extractIndex(str: any): string;
+export declare function adjustColumnOrder(columns: any): any[];

package/es/index.mjs

@@ -92,7 +92,7 @@ import { TinyColor } from "@ctrl/tinycolor";
 import * as i18next from "i18next";
 import i18next__default from "i18next";
 import * as antIcons from "@ant-design/icons";
-import antIcons__default, { LoadingOutlined, createFromIconfontCN, RightOutlined, QuestionCircleOutlined, MenuOutlined, CloseOutlined, CloseCircleOutlined, PlusOutlined, DragOutlined, CopyOutlined, LeftOutlined, FileImageOutlined, ScanOutlined, CloseCircleFilled, ExclamationCircleFilled, UserOutlined, HighlightOutlined, EllipsisOutlined, ArrowLeftOutlined, DownOutlined, DownloadOutlined, UndoOutlined, RedoOutlined, InboxOutlined, DeleteOutlined, CheckOutlined, EditOutlined, ZoomInOutlined, EyeInvisibleOutlined, EyeOutlined, VerticalAlignBottomOutlined, VerticalAlignTopOutlined, VerticalAlignMiddleOutlined, RightSquareOutlined, SyncOutlined, ApiOutlined, SettingOutlined, ReadOutlined, ReloadOutlined, ArrowUpOutlined, ArrowDownOutlined, LockOutlined, UploadOutlined, SwapOutlined, RotateLeftOutlined, RotateRightOutlined, ZoomOutOutlined, ThunderboltOutlined, SearchOutlined, TableOutlined, FormOutlined, ProfileOutlined, AppstoreOutlined, OrderedListOutlined, LineOutlined, DisconnectOutlined, TranslationOutlined } from "@ant-design/icons";
+import antIcons__default, { LoadingOutlined, createFromIconfontCN, RightOutlined, QuestionCircleOutlined, MenuOutlined, CloseOutlined, CloseCircleOutlined, PlusOutlined, DragOutlined, CopyOutlined, LeftOutlined, FileImageOutlined, ScanOutlined, CloseCircleFilled, ExclamationCircleFilled, UserOutlined, HighlightOutlined, EllipsisOutlined, ArrowLeftOutlined, DownOutlined, DownloadOutlined, UndoOutlined, RedoOutlined, InboxOutlined, DeleteOutlined, CheckOutlined, EditOutlined, ZoomInOutlined, EyeInvisibleOutlined, EyeOutlined, VerticalAlignBottomOutlined, VerticalAlignTopOutlined, VerticalAlignMiddleOutlined, RightSquareOutlined, SyncOutlined, ApiOutlined, SettingOutlined, ReadOutlined, ReloadOutlined, ArrowUpOutlined, ArrowDownOutlined, LockOutlined, ExclamationCircleOutlined, UploadOutlined, SwapOutlined, RotateLeftOutlined, RotateRightOutlined, ZoomOutOutlined, ThunderboltOutlined, SearchOutlined, TableOutlined, FormOutlined, ProfileOutlined, AppstoreOutlined, OrderedListOutlined, LineOutlined, DisconnectOutlined, TranslationOutlined } from "@ant-design/icons";
 import * as ReactRouter from "react-router";
 import { matchRoutes } from "react-router";
 import omit$1 from "lodash/omit";
@@ -148,6 +148,7 @@ import * as acorn from "acorn";
 import { SiderContext } from "antd/es/layout/Sider";
 import "@dnd-kit/utilities";
 import { customAlphabet } from "nanoid";
+import { isDesktop, deviceType } from "react-device-detect";
 import BigNumber from "bignumber.js";
 import * as math from "mathjs";
 import { isFunction as isFunction$1 } from "mathjs";
@@ -161,7 +162,6 @@ import useAntdInputStyle from "antd/es/input/style";
 import { Cron as Cron$1 } from "react-js-cron";
 import "react-js-cron/dist/styles.css";
 import { Line, Area, Column, Bar, Pie, Rose, WordCloud, Scatter, Radar, DualAxes, TinyLine, TinyColumn, TinyArea, Histogram, Progress as Progress$1, RingProgress, Heatmap, Box, Violin, Venn, Stock, Funnel, Liquid, Bullet, Sunburst, Gauge, Waterfall, RadialBar, BidirectionalBar, Treemap, Sankey, Chord, CirclePacking, Mix, Facet } from "@antv/g2plot";
-import { isDesktop } from "react-device-detect";
 import ReactDragListView from "react-drag-listview";
 import useUploadStyle from "antd/es/upload/style";
 import filesize from "filesize";
@@ -9556,7 +9556,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.5", 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.7", 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",
@@ -9579,10 +9579,10 @@ const name = "@nocobase/client", version = "2.0.0-alpha.5", 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.5",
-  "@nocobase/flow-engine": "2.0.0-alpha.5",
-  "@nocobase/sdk": "2.0.0-alpha.5",
-  "@nocobase/utils": "2.0.0-alpha.5",
+  "@nocobase/evaluators": "2.0.0-alpha.7",
+  "@nocobase/flow-engine": "2.0.0-alpha.7",
+  "@nocobase/sdk": "2.0.0-alpha.7",
+  "@nocobase/utils": "2.0.0-alpha.7",
   "@tanstack/react-table": "^8.21.3",
   "@types/tabulator-tables": "^6.2.6",
   ahooks: "^3.7.2",
@@ -10806,7 +10806,7 @@ const useArrayField$1 = (e) => {
   const t = useField();
   return e.field || t;
 };
-function adjustColumnOrder$1(e) {
+function adjustColumnOrder$2(e) {
   const t = [], o = [], n = [];
   return e.forEach((r) => {
     r.fixed === "left" ? t.push(r) : r.fixed === "right" ? n.push(r) : o.push(r);
@@ -10957,7 +10957,7 @@ const TableCellRender = ({ record: e, columnSchema: t, uiSchema: o, filterProper
             }
           );
       }
-    }), adjustColumnOrder$1(w);
+    }), adjustColumnOrder$2(w);
   }, [T, c, r, u, e.showDel, l]);
 }, SortableRow$1 = (e) => {
   var m, g, x;
@@ -29976,7 +29976,7 @@ const useStyles$a = genStyleHook("nb-markdown", (e, { isDarkTheme: t }) => {
     }, t ? i : r)
   };
 }), parseMarkdown$1 = _.memoize((e) => E(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$1(e) {
   const [t, o] = useState(""), [n, r] = useState(!0);
@@ -47285,7 +47285,7 @@ const CreateRecordAction$1 = forwardRef(InternalCreateRecordAction), initializer
 function getSchemaArrJSON(e) {
   return e.map((t) => t.name === "actions" ? omit(t.toJSON(), "properties") : t.toJSON());
 }
-function adjustColumnOrder(e) {
+function adjustColumnOrder$1(e) {
   const t = [], o = [], n = [];
   return e.forEach((r) => {
     r.fixed === "left" ? t.push(r) : r.fixed === "right" ? n.push(r) : o.push(r);
@@ -47379,7 +47379,7 @@ const useColumnsDeepMemoized = (e) => {
             }
           );
       }
-    }), adjustColumnOrder(C);
+    }), adjustColumnOrder$1(C);
   }, [y, c, r, u, e.showDel, l]);
 }, INITIAL_ROWS_NUMBER = 20, SortableRow = (e) => {
   var g, b, y, S, C, v;
@@ -65442,16 +65442,16 @@ const { DateFilterDynamicComponent: DateFilterDynamicComponentLazy$1 } = lazy(
   "DateFilterDynamicComponent"
 );
 function createStaticInputRenderer$1(e, t, o) {
-  var c;
-  const n = e == null ? void 0 : e["x-component"], r = ((c = t == null ? void 0 : t.uiSchema) == null ? void 0 : c["x-component-props"]) || {}, i = (e == null ? void 0 : e["x-component-props"]) || {}, a = merge$1({}, r, i), l = f({
+  var u;
+  const n = e == null ? void 0 : e["x-component"], r = ((u = t == null ? void 0 : t.uiSchema) == null ? void 0 : u["x-component-props"]) || {}, i = (e == null ? void 0 : e["x-component-props"]) || {}, a = merge$1({}, r, i), l = (e == null ? void 0 : e.enum) || [], c = f({
     style: f({ width: 200 }, (a == null ? void 0 : a.style) || {}),
     placeholder: (a == null ? void 0 : a.placeholder) || o("Enter value")
   }, a);
-  return (u) => {
-    const h = u || {}, { value: d, onChange: p } = h, m = W(h, ["value", "onChange"]);
-    return n === "InputNumber" ? /* @__PURE__ */ jsx(InputNumber$1, I(f(f({}, l), m), { value: d, onChange: p })) : n === "NumberPicker" ? /* @__PURE__ */ jsx(NumberPicker, I(f(f({}, l), m), { value: d, onChange: p })) : n === "Switch" ? /* @__PURE__ */ jsx(Switch, I(f(f({}, l), m), { checked: !!d, onChange: p })) : n === "Select" ? /* @__PURE__ */ jsx(Select$1, I(f(f({}, l), m), { value: d, onChange: p })) : n === "DateFilterDynamicComponent" ? /* @__PURE__ */ jsx(DateFilterDynamicComponentLazy$1, I(f(f({}, l), m), { value: d, onChange: p })) : /* @__PURE__ */ jsx(Input$3, I(f(f({}, l), m), { value: d, onChange: (g) => {
-      var x;
-      return p == null ? void 0 : p((x = g == null ? void 0 : g.target) == null ? void 0 : x.value);
+  return (d) => {
+    const g = d || {}, { value: p, onChange: m } = g, h = W(g, ["value", "onChange"]);
+    return n === "InputNumber" ? /* @__PURE__ */ jsx(InputNumber$1, I(f(f({}, c), h), { value: p, onChange: m })) : n === "NumberPicker" ? /* @__PURE__ */ jsx(NumberPicker, I(f(f({}, c), h), { value: p, onChange: m })) : n === "Switch" ? /* @__PURE__ */ jsx(Switch, I(f(f({}, c), h), { checked: !!p, onChange: m })) : n === "Select" ? /* @__PURE__ */ jsx(Select$1, I(f(f({ options: l }, c), h), { value: p, onChange: m })) : n === "DateFilterDynamicComponent" ? /* @__PURE__ */ jsx(DateFilterDynamicComponentLazy$1, I(f(f({}, c), h), { value: p, onChange: m })) : /* @__PURE__ */ jsx(Input$3, I(f(f({}, c), h), { value: p, onChange: (x) => {
+      var b;
+      return m == null ? void 0 : m((b = x == null ? void 0 : x.target) == null ? void 0 : b.value);
     } }));
   };
 }
@@ -65924,6 +65924,26 @@ const getKey = (e) => `${e.params.viewUid}_${e.index}`, FlowRoute = () => {
   return useEffect(() => {
     t.context.defineProperty("isMobileLayout", {
       get: () => r
+    }), t.context.defineProperty("deviceType", {
+      get: () => deviceType === "browser" ? "computer" : deviceType,
+      cache: !1,
+      meta: {
+        type: "string",
+        title: t.translate("Current device type"),
+        interface: "select",
+        uiSchema: {
+          enum: [
+            { label: t.translate("Computer"), value: "computer" },
+            { label: t.translate("Mobile"), value: "mobile" },
+            { label: t.translate("Tablet"), value: "tablet" },
+            { label: t.translate("SmartTv"), value: "smarttv" },
+            { label: t.translate("Console"), value: "console" },
+            { label: t.translate("Wearable"), value: "wearable" },
+            { label: t.translate("Embedded"), value: "embedded" }
+          ],
+          "x-component": "Select"
+        }
+      }
     });
   }, [r, t]), useEffect(() => {
     r ? t.flowSettings.disable() : u && t.flowSettings.enable();
@@ -66538,7 +66558,7 @@ const getKey = (e) => `${e.params.viewUid}_${e.index}`, FlowRoute = () => {
           large: "80%"
         },
         embed: {}
-      }, a = e.inputArgs.pageModelClass || t.pageModelClass || "ChildPageModel", l = e.inputArgs.mode || t.mode || "drawer", c = e.inputArgs.size || t.size || "medium";
+      }, a = e.inputArgs.pageModelClass || t.pageModelClass || "ChildPageModel", l = e.inputArgs.isMobileLayout ? "embed" : e.inputArgs.mode || t.mode || "drawer", c = e.inputArgs.size || t.size || "medium";
       let u = null, d = null, p = e.model.uid;
       if (t.subModelKey) {
         const ae = yield e.engine.loadOrCreateModel({
@@ -66558,8 +66578,7 @@ const getKey = (e) => `${e.params.viewUid}_${e.index}`, FlowRoute = () => {
         openerUids: g
       });
       x.filterByTk = (te = o.filterByTk) != null ? te : t.filterByTk, x.sourceId = (ne = o.sourceId) != null ? ne : t.sourceId, yield e.viewer.open({
-        type: e.inputArgs.isMobileLayout ? "embed" : l,
-        // 移动端中只需要显示子页面
+        type: l,
         inputArgs: x,
         preventClose: !!t.preventClose,
         destroyOnClose: !0,
@@ -67751,12 +67770,12 @@ const CodeEditor = (e) => {
 }, titleField = defineAction({
   name: "titleField",
   title: tval$1("Label field"),
-  uiSchema: (e) => e.collectionField.isAssociationField() ? {
+  uiSchema: (e) => !e.collectionField || !e.collectionField.isAssociationField() ? null : {
     label: {
       "x-component": SelectOptions$1,
       "x-decorator": "FormItem"
     }
-  } : null,
+  },
   defaultParams: (e) => {
     var o;
     const t = e.model.context.collectionField.targetCollectionTitleFieldName;
@@ -67807,7 +67826,7 @@ const CodeEditor = (e) => {
     });
   }
 }), parseMarkdown = _.memoize((e) => E(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(e) {
   const [t, o] = useState(""), [n, r] = useState(!0);
@@ -68614,9 +68633,12 @@ DetailsItemModel.registerFlow({
           }
         }
       }),
-      defaultParams: (e) => ({
-        title: e.collectionField.title
-      }),
+      defaultParams: (e) => {
+        var t;
+        return {
+          title: (t = e.collectionField) == null ? void 0 : t.title
+        };
+      },
       handler(e, t) {
         e.model.setProps({ label: t.title });
       }
@@ -68736,16 +68758,18 @@ const displayFieldComponent = defineAction({
   title: escapeT("Field component"),
   uiSchema: (e) => {
     const { titleField: t } = e.model.props;
-    return e.model.constructor.getBindingsByField(e, e.collectionField).length === 1 && !t ? null : {
+    return e.collectionField ? e.model.constructor.getBindingsByField(e, e.collectionField).length === 1 && !t ? null : {
       use: {
         type: "string",
         "x-component": "Select",
         "x-decorator": "FormItem",
         enum: buildAssociationOptions(e, e.model.constructor, t)
       }
-    };
+    } : void 0;
   },
   beforeParamsSave: (e, t, o) => E(void 0, null, function* () {
+    if (!e.collectionField)
+      return;
     const n = e.model.constructor.getBindingsByField(e, e.collectionField), { titleField: r } = e.model.props;
     let i = [];
     r && (i = e.model.constructor.getBindingsByField(
@@ -68783,8 +68807,8 @@ const displayFieldComponent = defineAction({
   name: "fieldComponent",
   uiSchema: (e) => {
     if (e.model.getProps().pattern === "readPretty") {
-      const { titleField: t } = e.model.props;
-      return e.model.constructor.getBindingsByField(e, e.collectionField).length === 1 && !t ? null : {
+      const { titleField: t } = e.model.props, o = e.model.constructor.getBindingsByField(e, e.collectionField);
+      return !o || o.length === 1 && !t ? null : {
         use: {
           type: "string",
           "x-component": "Select",
@@ -68794,7 +68818,7 @@ const displayFieldComponent = defineAction({
       };
     } else {
       const t = e.model.constructor.getBindingsByField(e, e.collectionField);
-      return t.length === 1 ? null : {
+      return !t || t.length === 1 ? null : {
         use: {
           type: "string",
           "x-component": "Select",
@@ -68848,38 +68872,42 @@ const displayFieldComponent = defineAction({
   handler(e, t) {
     return E(this, null, function* () {
       var n, r;
-      (yield e.aclCheck({
+      const o = yield e.aclCheck({
         dataSourceKey: (n = e.model.context.dataSource) == null ? void 0 : n.key,
         resourceName: e.model.context.resourceName,
         actionName: e.model.context.actionName,
         fields: ((r = e.model.context) == null ? void 0 : r.collectionField) && [e.model.context.collectionField.name]
-      })) || (e.model.hidden = !0, e.exitAll());
+      });
+      e.fieldPath && !e.collectionField && (e.model.fieldDeleted = !0, e.model.hidden = !0, e.exitAll()), o || (e.model.hidden = !0, e.exitAll());
     });
   }
 }), pattern = defineAction({
   name: "pattern",
   title: escapeT("Display mode"),
-  uiSchema: (e) => ({
-    pattern: {
-      "x-component": "Select",
-      "x-decorator": "FormItem",
-      enum: [
-        {
-          value: "editable",
-          label: escapeT("Editable")
-        },
-        {
-          value: "disabled",
-          label: escapeT("Disabled")
-        },
-        {
-          value: "readPretty",
-          label: escapeT("Display only")
+  uiSchema: (e) => {
+    if (e.model.collectionField)
+      return {
+        pattern: {
+          "x-component": "Select",
+          "x-decorator": "FormItem",
+          enum: [
+            {
+              value: "editable",
+              label: escapeT("Editable")
+            },
+            {
+              value: "disabled",
+              label: escapeT("Disabled")
+            },
+            {
+              value: "readPretty",
+              label: escapeT("Display only")
+            }
+          ],
+          "x-disabled": e.model.collectionField.inputable === !1
         }
-      ],
-      "x-disabled": e.model.collectionField.inputable === !1
-    }
-  }),
+      };
+  },
   defaultParams: (e) => ({
     pattern: e.model.collectionField.inputable === !1 || e.model.context.parentDisabled || e.model.props.disabled || e.model.collectionField.readonly ? "disabled" : "editable"
   }),
@@ -68926,6 +68954,8 @@ const validation = defineAction({
   title: escapeT("Validation"),
   name: "validation",
   uiSchema: (e) => {
+    if (!e.model.collectionField)
+      return;
     const t = e.app.dataSourceManager.collectionFieldInterfaceManager.getFieldInterface(
       e.model.collectionField.interface
     );
@@ -68966,6 +68996,29 @@ const validation = defineAction({
       });
     }
   }
+}), fixed = defineAction({
+  title: tval$1("Fixed"),
+  name: "fixed",
+  uiSchema: (e) => {
+    const t = e.t;
+    return {
+      fixed: {
+        "x-component": "Select",
+        "x-decorator": "FormItem",
+        enum: [
+          { label: t("Not fixed"), value: "none" },
+          { label: t("Left fixed"), value: "left" },
+          { label: t("Right fixed"), value: "right" }
+        ]
+      }
+    };
+  },
+  defaultParams: {
+    fixed: "none"
+  },
+  handler(e, t) {
+    e.model.setProps("fixed", t.fixed);
+  }
 }), FieldAssignValueInput = ({ fieldUid: e, value: t, onChange: o }) => {
   var x, b, y;
   const n = useFlowContext(), r = React.useMemo(() => {
@@ -69917,6 +69970,7 @@ const overflowMode = defineAction({
   displayFieldComponent,
   fieldComponent,
   fieldLinkageRules,
+  fixed,
   layout,
   linkageAssignField,
   linkageRunjs,
@@ -70172,7 +70226,7 @@ RecordSelectFieldModel.registerFlow({
     allowMultiple: {
       title: escapeT("Allow multiple"),
       uiSchema(e) {
-        return ["belongsToMany", "hasMany", "belongsToArray"].includes(e.model.context.collectionField.type) ? {
+        return e.collectionField && ["belongsToMany", "hasMany", "belongsToArray"].includes(e.collectionField.type) ? {
           allowMultiple: {
             "x-component": "Switch",
             type: "boolean",
@@ -70182,9 +70236,7 @@ RecordSelectFieldModel.registerFlow({
       },
       defaultParams(e) {
         return {
-          allowMultiple: ["belongsToMany", "hasMany", "belongsToArray"].includes(
-            e.model.context.collectionField.type
-          )
+          allowMultiple: e.collectionField && ["belongsToMany", "hasMany", "belongsToArray"].includes(e.model.context.collectionField.type)
         };
       },
       handler(e, t) {
@@ -72953,11 +73005,15 @@ FormItemModel.registerFlow({
           }
         }
       }),
-      defaultParams: (e) => ({
-        label: e.collectionField.title
-      }),
+      defaultParams: (e) => {
+        var t;
+        return {
+          label: (t = e.collectionField) == null ? void 0 : t.title
+        };
+      },
       handler(e, t) {
-        e.model.setProps({ label: t.label || e.collectionField.title });
+        var o;
+        e.model.setProps({ label: t.label || ((o = e.collectionField) == null ? void 0 : o.title) });
       }
     },
     aclCheck: {
@@ -73071,12 +73127,12 @@ FormItemModel.registerFlow({
     fieldNames: {
       use: "titleField",
       uiSchema: (e) => E(void 0, null, function* () {
-        return e.collectionField.isAssociationField() && e.model.getProps().titleField ? {
+        return e.collectionField ? e.collectionField.isAssociationField() && e.model.getProps().titleField ? {
           label: {
             "x-component": SelectOptions$1,
             "x-decorator": "FormItem"
           }
-        } : null;
+        } : null : void 0;
       }),
       beforeParamsSave: (e, t, o) => E(void 0, null, function* () {
         if (!(e.collectionField.isAssociationField() && e.model.props.titleField))
@@ -75723,6 +75779,10 @@ TableCustomColumnModel.registerFlow({
       handler(e, t) {
         e.model.setProps("width", t.width);
       }
+    },
+    fixed: {
+      title: escapeT("Fixed"),
+      use: "fixed"
     }
   }
 });
@@ -75855,6 +75915,12 @@ function extractIndex(e) {
     isNaN(o) || t.push(String(Number(o) + 1));
   }), t.join(".");
 }
+function adjustColumnOrder(e) {
+  const t = [], o = [], n = [];
+  return e.forEach((r) => {
+    r.fixed === "left" ? t.push(r) : r.fixed === "right" ? n.push(r) : o.push(r);
+  }), [...t, ...o, ...n];
+}
 const TableIndex = (e) => {
   const n = e, { index: t } = n, o = W(n, ["index"]);
   return /* @__PURE__ */ jsx("div", I(f({ className: classNames("nb-table-index"), style: { padding: "0 8px 0 16px" } }, o), { children: t }));
@@ -76056,7 +76122,7 @@ class TableBlockModel extends CollectionBlockModel {
       fixed: "right",
       width: 100,
       title: /* @__PURE__ */ jsx(AddFieldColumn$2, { model: this })
-    }), n;
+    }), adjustColumnOrder(n);
   }
   renderConfiguireActions() {
     return /* @__PURE__ */ jsx(
@@ -76317,9 +76383,20 @@ TableBlockModel.define({
   },
   sort: 300
 });
+function FieldDeletePlaceholder() {
+  const { t: e } = useTranslation(), t = useFlowModel(), o = t.context.blockModel, n = o.collection.dataSource, r = o.collection, i = t.fieldPath, a = useMemo(() => {
+    const c = `${e(n.displayName || n.key)} > `, u = r ? `${e(r.title) || r.name || r.tableName} > ` : "";
+    return `${c}${u}${i}`;
+  }, []), l = e('The {{type}} "{{name}}" may have been deleted. Please remove this {{blockType}}.', {
+    type: e("Field"),
+    name: a,
+    blockType: e("Field")
+  }).replaceAll(">", ">");
+  return /* @__PURE__ */ jsx(Tooltip, { title: l, children: /* @__PURE__ */ jsx(ExclamationCircleOutlined, { style: { opacity: "0.45" } }) });
+}
 const Re = class Re extends DisplayItemModel {
   renderHiddenInConfig() {
-    return /* @__PURE__ */ jsx(Tooltip, { title: this.context.t("该字段已被隐藏，你无法查看（该内容仅在激活 UI Editor 时显示）。"), children: /* @__PURE__ */ jsx(LockOutlined, { style: { opacity: "0.45" } }) });
+    return this.fieldDeleted ? /* @__PURE__ */ jsx(FieldDeletePlaceholder, {}) : /* @__PURE__ */ jsx(Tooltip, { title: this.context.t("该字段已被隐藏，你无法查看（该内容仅在激活 UI Editor 时显示）。"), children: /* @__PURE__ */ jsx(LockOutlined, { style: { opacity: "0.45" } }) });
   }
   afterAddAsSubModel() {
     return E(this, null, function* () {
@@ -76528,6 +76605,8 @@ TableColumnModel.registerFlow({
     quickEdit: {
       title: escapeT("Enable quick edit"),
       uiSchema: (e) => {
+        if (!e.model.collectionField)
+          return;
         const t = e.model.context.blockModel.collection.name, o = e.model.collectionField.collectionName;
         if (t === o)
           return {
@@ -76590,6 +76669,10 @@ TableColumnModel.registerFlow({
           titleField: t.label
         }, (n = (o = e.collectionField.targetCollection) == null ? void 0 : o.getField(t.label)) == null ? void 0 : n.getComponentProps()));
       }
+    },
+    fixed: {
+      title: escapeT("Fixed"),
+      use: "fixed"
     }
   }
 });
@@ -77164,6 +77247,10 @@ SubTableColumnModel.registerFlow({
     pattern: {
       title: escapeT("Display mode"),
       use: "pattern"
+    },
+    fixed: {
+      title: escapeT("Fixed"),
+      use: "fixed"
     }
   }
 });
@@ -77289,24 +77376,26 @@ class SubTableFieldModel extends AssociationFieldModel {
     const { enableIndexColumn: o } = this.props, n = !!((a = (i = this.flowEngine) == null ? void 0 : i.flowSettings) != null && a.enabled), r = this.mapSubModels("columns", (l) => l.getColumnProps()).filter(
       Boolean
     );
-    return [
-      o && {
-        key: "__index__",
-        width: 48,
-        align: "center",
-        fixed: "left",
-        render: (l) => l.rowIdx + 1
-      },
-      ...r.concat({
-        key: "_empty"
-      }),
-      n && {
-        key: "addColumn",
-        fixed: "right",
-        width: 100,
-        title: /* @__PURE__ */ jsx(AddFieldColumn$1, { model: this })
-      }
-    ].filter(Boolean);
+    return adjustColumnOrder(
+      [
+        o && {
+          key: "__index__",
+          width: 48,
+          align: "center",
+          fixed: "left",
+          render: (l) => l.rowIdx + 1
+        },
+        ...r.concat({
+          key: "_empty"
+        }),
+        n && {
+          key: "addColumn",
+          fixed: "right",
+          width: 100,
+          title: /* @__PURE__ */ jsx(AddFieldColumn$1, { model: this })
+        }
+      ].filter(Boolean)
+    );
   }
   render() {
     const o = this.getColumns(), n = {
@@ -78264,7 +78353,7 @@ FilterActionModel.registerFlow({
               FilterGroup,
               {
                 value: e.value || {},
-                FilterItem: (o) => /* @__PURE__ */ jsx(FilterItem, I(f({}, o), { model: t }))
+                FilterItem: (o) => /* @__PURE__ */ jsx(VariableFilterItem, I(f({}, o), { model: t }))
               }
             );
           }
@@ -80688,15 +80777,18 @@ ClickableFieldModel.registerFlow({
   steps: {
     displayStyle: {
       title: escapeT("Display style"),
-      uiSchema: (e) => ["select", "multipleSelect", "radioGroup", "checkboxGroup"].includes(e.collectionField.interface) ? null : {
-        displayStyle: {
-          "x-component": "Radio.Group",
-          "x-decorator": "FormItem",
-          enum: [
-            { label: escapeT("Tag"), value: "tag" },
-            { label: escapeT("Text"), value: "text" }
-          ]
-        }
+      uiSchema: (e) => {
+        var t;
+        return ["select", "multipleSelect", "radioGroup", "checkboxGroup"].includes((t = e.collectionField) == null ? void 0 : t.interface) ? null : {
+          displayStyle: {
+            "x-component": "Radio.Group",
+            "x-decorator": "FormItem",
+            enum: [
+              { label: escapeT("Tag"), value: "tag" },
+              { label: escapeT("Text"), value: "text" }
+            ]
+          }
+        };
       },
       defaultParams: {
         displayStyle: "text"
@@ -80811,24 +80903,26 @@ class DisplaySubTableFieldModel extends FieldModel {
   }
   getColumns() {
     const { enableIndexColumn: t = !0 } = this.props, o = this.mapSubModels("columns", (n) => n.getColumnProps()).filter((n) => !n.hidden);
-    return [
-      t && {
-        key: "__index__",
-        width: 48,
-        align: "center",
-        fixed: "left",
-        render: (n, r, i) => i + 1
-      },
-      ...o.concat({
-        key: "empty"
-      }),
-      {
-        key: "addColumn",
-        fixed: "right",
-        width: 100,
-        title: /* @__PURE__ */ jsx(AddFieldColumn, { model: this })
-      }
-    ].filter(Boolean);
+    return adjustColumnOrder(
+      [
+        t && {
+          key: "__index__",
+          width: 48,
+          align: "center",
+          fixed: "left",
+          render: (n, r, i) => i + 1
+        },
+        ...o.concat({
+          key: "empty"
+        }),
+        {
+          key: "addColumn",
+          fixed: "right",
+          width: 100,
+          title: /* @__PURE__ */ jsx(AddFieldColumn, { model: this })
+        }
+      ].filter(Boolean)
+    );
   }
   render() {
     return /* @__PURE__ */ jsx(