@nocobase/client 1.0.0-alpha.12 → 1.0.0-alpha.14

package/es/application/schema-initializer/hooks/useSchemaInitializerRender.d.ts

@@ -9,7 +9,8 @@
 import { ButtonProps } from 'antd';
 import React from 'react';
 import { SchemaInitializerOptions } from '../types';
-export declare function useSchemaInitializerRender<P1 = ButtonProps, P2 = {}>(name: string, options?: Omit<SchemaInitializerOptions<P1, P2>, 'name'>): {
+import { SchemaInitializer } from '../SchemaInitializer';
+export declare function useSchemaInitializerRender<P1 = ButtonProps, P2 = {}>(name: string | SchemaInitializer<P1, P2>, options?: Omit<SchemaInitializerOptions<P1, P2>, 'name'>): {
     exists: boolean;
     render: () => any;
 } | {

package/es/application/schema-settings/hooks/useSchemaSettingsRender.d.ts

@@ -12,12 +12,13 @@ import { SchemaSettingsProps } from '../../../schema-settings';
 import { Schema } from '@formily/json-schema';
 import { GeneralField } from '@formily/core';
 import { Designable } from '../../../schema-component';
+import { SchemaSettings } from '../SchemaSettings';
 type UseSchemaSettingsRenderOptions<T = {}> = Omit<SchemaSettingOptions<T>, 'name' | 'items'> & Omit<SchemaSettingsProps, 'title' | 'children'> & {
     fieldSchema?: Schema;
     field?: GeneralField;
     dn?: Designable;
 };
-export declare function useSchemaSettingsRender<T = {}>(name: string, options?: UseSchemaSettingsRenderOptions<T>): {
+export declare function useSchemaSettingsRender<T = {}>(name: string | SchemaSettings<T>, options?: UseSchemaSettingsRenderOptions<T>): {
     exists: boolean;
     render: () => any;
 } | {

package/es/index.mjs

@@ -3779,7 +3779,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version$1 = "1.0.0-alpha.12", 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.0.0-alpha.14", 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",
@@ -3800,9 +3800,9 @@ const name = "@nocobase/client", version$1 = "1.0.0-alpha.12", license = "AGPL-3
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.0.0-alpha.12",
-  "@nocobase/sdk": "1.0.0-alpha.12",
-  "@nocobase/utils": "1.0.0-alpha.12",
+  "@nocobase/evaluators": "1.0.0-alpha.14",
+  "@nocobase/sdk": "1.0.0-alpha.14",
+  "@nocobase/utils": "1.0.0-alpha.14",
   ahooks: "^3.7.2",
   antd: "^5.12.8",
   "antd-style": "3.4.5",
@@ -3815,7 +3815,7 @@ const name = "@nocobase/client", version$1 = "1.0.0-alpha.12", license = "AGPL-3
   i18next: "^22.4.9",
   "i18next-http-backend": "^2.1.1",
   lodash: "4.17.21",
-  "markdown-it": "13.0.1",
+  "markdown-it": "14.1.0",
   "markdown-it-highlightjs": "3.3.1",
   mathjs: "^10.6.0",
   mermaid: "9.4.3",
@@ -3840,7 +3840,7 @@ const name = "@nocobase/client", version$1 = "1.0.0-alpha.12", license = "AGPL-3
   "react-is": ">=18.0.0"
 }, devDependencies = {
   "@testing-library/react": "^14.0.0",
-  "@types/markdown-it": "12.2.3",
+  "@types/markdown-it": "14.1.1",
   "@types/markdown-it-highlightjs": "3.3.1",
   "@types/react-big-calendar": "^1.6.4",
   "axios-mock-adapter": "^1.20.0",
@@ -6037,7 +6037,7 @@ const InitializerComponent = React.memo((e) => {
 InitializerComponent.displayName = "InitializerComponent";
 function useSchemaInitializerRender(e, t) {
   const o = useApp(), n = useMemo(
-    () => o.schemaInitializerManager.get(e),
+    () => typeof e == "object" ? e : o.schemaInitializerManager.get(e),
     [o.schemaInitializerManager, e]
   );
   return useMemo(() => e ? n ? {
@@ -11125,12 +11125,18 @@ function WorkflowSelect(r) {
 function WorkflowConfig() {
   var u;
   const { dn: e } = useDesignable(), { t } = useTranslation(), o = useFieldSchema(), n = useCollection_deprecated(), r = useFormBlockContext(), i = (r == null ? void 0 : r.type) || o["x-action"], a = r == null ? void 0 : r.type, l = o["x-action"], c = {
-    submit: t("Workflow will be triggered before or after submitting succeeded based on workflow type.", {
-      ns: "workflow"
-    }),
-    "customize:save": t("Workflow will be triggered before or after submitting succeeded based on workflow type.", {
-      ns: "workflow"
-    }),
+    submit: t(
+      "Workflow will be triggered before or after submitting succeeded based on workflow type (supports pre/post action and approval event).",
+      {
+        ns: "workflow"
+      }
+    ),
+    "customize:save": t(
+      "Workflow will be triggered before or after submitting succeeded based on workflow type (supports pre/post action and approval event).",
+      {
+        ns: "workflow"
+      }
+    ),
     "customize:triggerWorkflows": t(
       'Workflow will be triggered directly once the button clicked, without data saving. Only supports to be bound with "Custom action event".',
       { ns: "@nocobase/plugin-workflow-custom-action-trigger" }
@@ -11139,7 +11145,9 @@ function WorkflowConfig() {
       '"Submit to workflow" to "Post-action event" is deprecated, please use "Custom action event" instead.',
       { ns: "workflow" }
     ),
-    destroy: t("Workflow will be triggered before deleting succeeded.", { ns: "workflow" })
+    destroy: t("Workflow will be triggered before deleting succeeded (only supports pre-action event).", {
+      ns: "workflow"
+    })
   }[o == null ? void 0 : o["x-action"]];
   return /* @__PURE__ */ jsx(
     SchemaSettingsActionModalItem,
@@ -17185,7 +17193,10 @@ const SchemaSettingsWrapper = (e) => {
   );
 };
 function useSchemaSettingsRender(e, t) {
-  const o = useApp(), n = useMemo(() => o.schemaSettingsManager.get(e), [o.schemaSettingsManager, e]);
+  const o = useApp(), n = useMemo(
+    () => typeof e == "object" ? e : o.schemaSettingsManager.get(e),
+    [o.schemaSettingsManager, e]
+  );
   return e ? n ? {
     exists: !0,
     render: (r = {}) => React.createElement(SchemaSettingsWrapper, x(x(x({}, n.options), t), r))
@@ -19641,10 +19652,10 @@ const useStyles$f = createStyles(() => ({
         return o.map((M) => u(M));
     }
   }, [u, o]), { render: y, exists: b } = useSchemaSettingsRender(
-    t["x-settings"] || r,
+    r || t["x-settings"],
     t["x-settings-props"]
   ), { render: S, exists: v } = useSchemaInitializerRender(
-    t["x-initializer"] || n,
+    n || t["x-initializer"],
     t["x-initializer-props"]
   ), k = useGridRowContext(), A = useGridContext(), P = useMemo(() => {
     var M;
@@ -31779,14 +31790,17 @@ const useTableColumns$1 = (e) => {
   return useMemo(() => {
     if (!a)
       return m;
-    const g = [...m];
-    return i && g.push({
-      title: l(),
-      dataIndex: "TABLE_COLUMN_INITIALIZER",
-      key: "TABLE_COLUMN_INITIALIZER",
-      render: () => /* @__PURE__ */ jsx("div", { style: { minWidth: 180 } }),
-      fixed: "right"
-    }), e.showDel && g.push({
+    const g = [
+      ...m,
+      {
+        title: l(),
+        dataIndex: "TABLE_COLUMN_INITIALIZER",
+        key: "TABLE_COLUMN_INITIALIZER",
+        render: i ? () => /* @__PURE__ */ jsx("div", { style: { minWidth: 180 } }) : null,
+        fixed: i ? "right" : "none"
+      }
+    ];
+    return e.showDel && g.push({
       title: "",
       key: "delete",
       width: 60,
@@ -33099,7 +33113,24 @@ const AutoComplete = withDynamicSchemaProps(
   return /* @__PURE__ */ jsx(Card, F(x({ ref: o, bordered: !1, style: { marginBottom: i.marginBlock } }, t), { children: e }));
 });
 BlockItemCard.displayName = "BlockItemCard";
-const FallbackComponent = (e) => /* @__PURE__ */ jsx(BlockItemCard, { children: /* @__PURE__ */ jsx(ErrorFallback, x({}, e)) }), BlockItemError = ({ children: e }) => /* @__PURE__ */ jsx(ErrorBoundary, { FallbackComponent, onError: (o) => {
+const blockDeleteSettings = new SchemaSettings({
+  name: "blockDeleteSettings",
+  items: [
+    {
+      name: "remove",
+      type: "remove",
+      componentProps: {
+        removeParentsIfNoChildren: !0,
+        breakRemoveOn(e) {
+          return e["x-component"] === "Grid";
+        }
+      }
+    }
+  ]
+}), FallbackComponent = (e) => /* @__PURE__ */ jsxs(BlockItemCard, { children: [
+  /* @__PURE__ */ jsx(SchemaToolbar, { settings: blockDeleteSettings, draggable: !1 }),
+  /* @__PURE__ */ jsx(ErrorFallback, x({}, e))
+] }), BlockItemError = ({ children: e }) => /* @__PURE__ */ jsx(ErrorBoundary, { FallbackComponent, onError: (o) => {
   console.error(o);
 }, children: e }), useStyles$a = genStyleHook("nb-card-item", (e) => {
   const { componentCls: t } = e;
@@ -39394,6 +39425,7 @@ function TextArea(e) {
           .ant-input {
             flex-grow: 1;
             min-width: 200px;
+            word-break: break-all;
           }
           .ant-input-disabled {
             .ant-tag {
@@ -39419,6 +39451,7 @@ function TextArea(e) {
               onPaste: j,
               onCompositionStart: z,
               onCompositionEnd: O,
+              placeholder: e.placeholder,
               className: cx(
                 o,
                 "ant-input",
@@ -39427,6 +39460,11 @@ function TextArea(e) {
             overflow: auto;
             white-space: ${l ? "normal" : "nowrap"};
 
+            &[placeholder]:empty::before {
+              content: attr(placeholder);
+              color: #ccc;
+            }
+
             .ant-tag {
               display: inline;
               line-height: 19px;

package/es/schema-settings/GeneralSchemaDesigner.d.ts

@@ -7,6 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { FC } from 'react';
+import { SchemaInitializer, SchemaSettings } from '../application';
 export interface GeneralSchemaDesignerProps {
     disableInitializer?: boolean;
     title?: string;
@@ -26,8 +27,8 @@ export declare const GeneralSchemaDesigner: FC<GeneralSchemaDesignerProps>;
 export interface SchemaToolbarProps {
     title?: string | string[];
     draggable?: boolean;
-    initializer?: string | false;
-    settings?: string | false;
+    initializer?: string | SchemaInitializer<any> | false;
+    settings?: string | SchemaSettings<any> | false;
     /**
      * @default true
      */