@nocobase/client 0.16.0-alpha.5 → 0.16.0-alpha.6

package/es/collection-manager/templates/types.d.ts

@@ -17,6 +17,8 @@ export interface ICollectionTemplate {
     divider?: boolean;
     /** 模板描述 */
     description?: string;
+    /**配置字段中的操作按钮 */
+    configureActions?: Record<string, ISchema>;
 }
 interface AvailableFieldInterfacesInclude {
     include?: any[];

package/es/index.mjs

@@ -3531,7 +3531,7 @@ const BlockTemplate = observer(
       var _a, _b;
       fieldSchema["x-linkage-rules"] = ((_a = data == null ? void 0 : data.data) == null ? void 0 : _a["x-linkage-rules"]) || [];
       fieldSchema.setProperties((_b = data == null ? void 0 : data.data) == null ? void 0 : _b.properties);
-      onTemplateSuccess();
+      onTemplateSuccess == null ? void 0 : onTemplateSuccess();
     };
     return template2 ? /* @__PURE__ */ jsx(BlockTemplateContext.Provider, { value: { dn, field, fieldSchema, template: template2 }, children: /* @__PURE__ */ jsx(RemoteSchemaComponent, { noForm: true, uid: template2 == null ? void 0 : template2.uid, onSuccess }) }) : null;
   },
@@ -34043,6 +34043,9 @@ const toValue$2 = (value, placeholder) => {
   }
   return value;
 };
+function isObject(value) {
+  return typeof value === "object" && value !== null;
+}
 const ReadPrettyInternalViewer = observer(
   (props) => {
     var _a;
@@ -34063,7 +34066,8 @@ const ReadPrettyInternalViewer = observer(
     const isTreeCollection = targetCollection.template === "tree";
     const ellipsisWithTooltipRef = useRef();
     const renderRecords = () => toArr$3(props.value).map((record2, index2, arr) => {
-      const label = isTreeCollection ? transformNestedData(record2).map((o) => o == null ? void 0 : o[(fieldNames == null ? void 0 : fieldNames.label) || "label"]).join(" / ") : record2 == null ? void 0 : record2[(fieldNames == null ? void 0 : fieldNames.label) || "label"];
+      const value = record2 == null ? void 0 : record2[(fieldNames == null ? void 0 : fieldNames.label) || "label"];
+      const label = isTreeCollection ? transformNestedData(record2).map((o) => o == null ? void 0 : o[(fieldNames == null ? void 0 : fieldNames.label) || "label"]).join(" / ") : isObject(value) ? JSON.stringify(value) : value;
       const val = toValue$2(compile2(label), "N/A");
       const labelUiSchema = useLabelUiSchema$1(
         (record2 == null ? void 0 : record2.__collection) || (collectionField == null ? void 0 : collectionField.target),
@@ -37913,8 +37917,8 @@ const CollectionSelect = connect(
       }, others), {
         showSearch: true,
         filterOption: (input2, option) => {
-          var _a2;
-          return ((_a2 = option == null ? void 0 : option.label) != null ? _a2 : "").includes(input2);
+          var _a2, _b;
+          return ((_a2 = option == null ? void 0 : option.label.toLowerCase()) != null ? _a2 : "").includes(input2.toLocaleLowerCase()) || ((_b = option == null ? void 0 : option.value.toString().toLowerCase()) != null ? _b : "").includes(input2.toLocaleLowerCase());
         },
         options
       })
@@ -55473,6 +55477,7 @@ const url = {
       "x-component": "Input.URL"
     }
   },
+  availableTypes: ["string"],
   schemaInitialize(schema3, { block }) {
   },
   properties: __spreadValues({}, defaultProps),
@@ -55783,9 +55788,6 @@ function areEqual(prevProps, nextProps) {
 }
 const PreviewFields = React.memo(PreviewCom, areEqual);
 PreviewFields.displayName = "PreviewFields";
-function isObject(value) {
-  return Object.prototype.toString.call(value) === "[object Object]";
-}
 const mapFields = ["lineString", "point", "circle", "polygon"];
 const PreviewTable$1 = (props) => {
   const { databaseView, schema: schema3, viewName, fields: fields2 } = props;
@@ -55844,7 +55846,7 @@ const PreviewTable$1 = (props) => {
                 "x-component": schema22 && fieldSource ? "CollectionField" : "Input",
                 "x-read-pretty": true,
                 "x-collection-field": fieldSource == null ? void 0 : fieldSource.join("."),
-                default: isObject(content) ? JSON.stringify(content) : content
+                default: item.interface === "json" ? JSON.stringify(content) : content
               }
             }
           };
@@ -57268,12 +57270,16 @@ const AddFieldAction = (props) => {
     const { exclude, include } = availableFieldInterfaces || {};
     const optionArr = [];
     getOptions$1().forEach((v) => {
+      var _a;
       if (v.key === "systemInfo") {
         optionArr.push(__spreadProps(__spreadValues({}, v), {
           children: v.children.filter((v2) => {
             if (v2.value === "id") {
               return typeof record["autoGenId"] === "boolean" ? record["autoGenId"] : true;
             } else if (v2.value === "tableoid") {
+              if (include == null ? void 0 : include.length) {
+                return include.includes(v2.value);
+              }
               return (database == null ? void 0 : database.dialect) === "postgres";
             } else {
               return typeof record[v2.value] === "boolean" ? record[v2.value] : true;
@@ -57284,19 +57290,20 @@ const AddFieldAction = (props) => {
         let children2 = [];
         if (include == null ? void 0 : include.length) {
           include.forEach((k) => {
-            const field = v.children.find((h) => [k, k.interface].includes(h.value));
+            var _a2;
+            const field = (_a2 = v == null ? void 0 : v.children) == null ? void 0 : _a2.find((h) => [k, k.interface].includes(h.value));
             field && children2.push(__spreadProps(__spreadValues({}, field), {
               targetScope: k == null ? void 0 : k.targetScope
             }));
           });
         } else if (exclude == null ? void 0 : exclude.length) {
-          children2 = v.children.filter((v2) => {
+          children2 = (_a = v == null ? void 0 : v.children) == null ? void 0 : _a.filter((v2) => {
             return !exclude.includes(v2.value);
           });
         } else {
-          children2 = v.children;
+          children2 = v == null ? void 0 : v.children;
         }
-        children2.length && optionArr.push(__spreadProps(__spreadValues({}, v), {
+        (children2 == null ? void 0 : children2.length) && optionArr.push(__spreadProps(__spreadValues({}, v), {
           children: children2
         }));
       }
@@ -57332,7 +57339,7 @@ const AddFieldAction = (props) => {
         label: compile2(option.label),
         title: compile2(option.label),
         key: option.label,
-        children: option.children.filter((child) => !["o2o", "subTable", "linkTo"].includes(child.name)).map((child) => {
+        children: option == null ? void 0 : option.children.filter((child) => !["o2o", "subTable", "linkTo"].includes(child.name)).map((child) => {
           return {
             role: "button",
             "aria-label": `${compile2(option.label)}-${child.name}`,
@@ -57345,7 +57352,7 @@ const AddFieldAction = (props) => {
       };
     }).filter((v) => {
       var _a;
-      return (_a = v.children) == null ? void 0 : _a.length;
+      return (_a = v == null ? void 0 : v.children) == null ? void 0 : _a.length;
     });
   }, [getFieldOptions]);
   const menu = useMemo(() => {
@@ -58491,9 +58498,9 @@ const CurrentFields = (props) => {
   const { t } = useTranslation();
   const { setState } = useResourceActionContext();
   const { resource, targetKey } = props.collectionResource || {};
-  const { [targetKey]: filterByTk, titleField } = useRecord();
+  const { [targetKey]: filterByTk, titleField, template: template2 } = useRecord();
   const [loadingRecord, setLoadingRecord] = React.useState(null);
-  const { refreshCM, isTitleField } = useCollectionManager();
+  const { refreshCM, isTitleField, getTemplate } = useCollectionManager();
   const columns = [
     {
       dataIndex: ["uiSchema", "rawTitle"],
@@ -58676,16 +58683,17 @@ const InheritFields = (props) => {
 const CollectionFields = () => {
   const compile2 = useCompile();
   const field = useField();
-  const { name } = useRecord();
+  const { name, template: template2 } = useRecord();
   const {
     data: { database }
   } = useCurrentAppInfo();
-  const { getInterface, getInheritCollections, getCollection, getCurrentCollectionFields } = useCollectionManager();
+  const { getInterface, getInheritCollections, getCollection, getCurrentCollectionFields, getTemplate } = useCollectionManager();
   const form = useMemo(() => createForm(), []);
   const f = useAttach(form.createArrayField(__spreadProps(__spreadValues({}, field.props), { basePath: "" })));
   const { t } = useTranslation();
   const collectionResource = useResourceContext();
   const { refreshAsync } = useContext(ResourceActionContext);
+  const targetTemplate = getTemplate(template2);
   const inherits = getInheritCollections(name);
   const columns = [
     {
@@ -58825,6 +58833,15 @@ const CollectionFields = () => {
           /* @__PURE__ */ jsx(Action, __spreadValues({}, deleteProps)),
           /* @__PURE__ */ jsx(SyncFieldsAction, __spreadValues({}, syncProps)),
           /* @__PURE__ */ jsx(SyncSQLFieldsAction, { refreshCMList: refreshAsync }),
+          /* @__PURE__ */ jsx(
+            SchemaComponent,
+            {
+              schema: {
+                type: "object",
+                properties: __spreadValues({}, targetTemplate.configureActions)
+              }
+            }
+          ),
           /* @__PURE__ */ jsx(AddCollectionField, __spreadValues({}, addProps))
         ]
       }

package/lib/index.js

@@ -4183,7 +4183,7 @@ const BlockTemplate = (0, import_react.observer)(
       var _a, _b;
       fieldSchema["x-linkage-rules"] = ((_a = data == null ? void 0 : data.data) == null ? void 0 : _a["x-linkage-rules"]) || [];
       fieldSchema.setProperties((_b = data == null ? void 0 : data.data) == null ? void 0 : _b.properties);
-      onTemplateSuccess();
+      onTemplateSuccess == null ? void 0 : onTemplateSuccess();
     };
     return template2 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(BlockTemplateContext.Provider, { value: { dn, field, fieldSchema, template: template2 }, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(RemoteSchemaComponent, { noForm: true, uid: template2 == null ? void 0 : template2.uid, onSuccess }) }) : null;
   },
@@ -34695,6 +34695,9 @@ const toValue$2 = (value, placeholder) => {
   }
   return value;
 };
+function isObject(value) {
+  return typeof value === "object" && value !== null;
+}
 const ReadPrettyInternalViewer = (0, import_react.observer)(
   (props) => {
     var _a;
@@ -34715,7 +34718,8 @@ const ReadPrettyInternalViewer = (0, import_react.observer)(
     const isTreeCollection = targetCollection.template === "tree";
     const ellipsisWithTooltipRef = (0, import_react2.useRef)();
     const renderRecords = () => (0, import_shared.toArr)(props.value).map((record2, index2, arr) => {
-      const label = isTreeCollection ? transformNestedData(record2).map((o) => o == null ? void 0 : o[(fieldNames == null ? void 0 : fieldNames.label) || "label"]).join(" / ") : record2 == null ? void 0 : record2[(fieldNames == null ? void 0 : fieldNames.label) || "label"];
+      const value = record2 == null ? void 0 : record2[(fieldNames == null ? void 0 : fieldNames.label) || "label"];
+      const label = isTreeCollection ? transformNestedData(record2).map((o) => o == null ? void 0 : o[(fieldNames == null ? void 0 : fieldNames.label) || "label"]).join(" / ") : isObject(value) ? JSON.stringify(value) : value;
       const val = toValue$2(compile2(label), "N/A");
       const labelUiSchema = useLabelUiSchema$1(
         (record2 == null ? void 0 : record2.__collection) || (collectionField == null ? void 0 : collectionField.target),
@@ -38565,8 +38569,8 @@ const CollectionSelect = (0, import_react.connect)(
       }, others), {
         showSearch: true,
         filterOption: (input2, option) => {
-          var _a2;
-          return ((_a2 = option == null ? void 0 : option.label) != null ? _a2 : "").includes(input2);
+          var _a2, _b;
+          return ((_a2 = option == null ? void 0 : option.label.toLowerCase()) != null ? _a2 : "").includes(input2.toLocaleLowerCase()) || ((_b = option == null ? void 0 : option.value.toString().toLowerCase()) != null ? _b : "").includes(input2.toLocaleLowerCase());
         },
         options
       })
@@ -56124,6 +56128,7 @@ const url = {
       "x-component": "Input.URL"
     }
   },
+  availableTypes: ["string"],
   schemaInitialize(schema3, { block }) {
   },
   properties: __spreadValues({}, defaultProps),
@@ -56434,9 +56439,6 @@ function areEqual(prevProps, nextProps) {
 }
 const PreviewFields = import_react2.default.memo(PreviewCom, areEqual);
 PreviewFields.displayName = "PreviewFields";
-function isObject(value) {
-  return Object.prototype.toString.call(value) === "[object Object]";
-}
 const mapFields = ["lineString", "point", "circle", "polygon"];
 const PreviewTable$1 = (props) => {
   const { databaseView, schema: schema3, viewName, fields: fields2 } = props;
@@ -56495,7 +56497,7 @@ const PreviewTable$1 = (props) => {
                 "x-component": schema22 && fieldSource ? "CollectionField" : "Input",
                 "x-read-pretty": true,
                 "x-collection-field": fieldSource == null ? void 0 : fieldSource.join("."),
-                default: isObject(content) ? JSON.stringify(content) : content
+                default: item.interface === "json" ? JSON.stringify(content) : content
               }
             }
           };
@@ -57919,12 +57921,16 @@ const AddFieldAction = (props) => {
     const { exclude, include } = availableFieldInterfaces || {};
     const optionArr = [];
     getOptions$1().forEach((v) => {
+      var _a;
       if (v.key === "systemInfo") {
         optionArr.push(__spreadProps(__spreadValues({}, v), {
           children: v.children.filter((v2) => {
             if (v2.value === "id") {
               return typeof record["autoGenId"] === "boolean" ? record["autoGenId"] : true;
             } else if (v2.value === "tableoid") {
+              if (include == null ? void 0 : include.length) {
+                return include.includes(v2.value);
+              }
               return (database == null ? void 0 : database.dialect) === "postgres";
             } else {
               return typeof record[v2.value] === "boolean" ? record[v2.value] : true;
@@ -57935,19 +57941,20 @@ const AddFieldAction = (props) => {
         let children2 = [];
         if (include == null ? void 0 : include.length) {
           include.forEach((k) => {
-            const field = v.children.find((h) => [k, k.interface].includes(h.value));
+            var _a2;
+            const field = (_a2 = v == null ? void 0 : v.children) == null ? void 0 : _a2.find((h) => [k, k.interface].includes(h.value));
             field && children2.push(__spreadProps(__spreadValues({}, field), {
               targetScope: k == null ? void 0 : k.targetScope
             }));
           });
         } else if (exclude == null ? void 0 : exclude.length) {
-          children2 = v.children.filter((v2) => {
+          children2 = (_a = v == null ? void 0 : v.children) == null ? void 0 : _a.filter((v2) => {
             return !exclude.includes(v2.value);
           });
         } else {
-          children2 = v.children;
+          children2 = v == null ? void 0 : v.children;
         }
-        children2.length && optionArr.push(__spreadProps(__spreadValues({}, v), {
+        (children2 == null ? void 0 : children2.length) && optionArr.push(__spreadProps(__spreadValues({}, v), {
           children: children2
         }));
       }
@@ -57983,7 +57990,7 @@ const AddFieldAction = (props) => {
         label: compile2(option.label),
         title: compile2(option.label),
         key: option.label,
-        children: option.children.filter((child) => !["o2o", "subTable", "linkTo"].includes(child.name)).map((child) => {
+        children: option == null ? void 0 : option.children.filter((child) => !["o2o", "subTable", "linkTo"].includes(child.name)).map((child) => {
           return {
             role: "button",
             "aria-label": `${compile2(option.label)}-${child.name}`,
@@ -57996,7 +58003,7 @@ const AddFieldAction = (props) => {
       };
     }).filter((v) => {
       var _a;
-      return (_a = v.children) == null ? void 0 : _a.length;
+      return (_a = v == null ? void 0 : v.children) == null ? void 0 : _a.length;
     });
   }, [getFieldOptions]);
   const menu = (0, import_react2.useMemo)(() => {
@@ -59142,9 +59149,9 @@ const CurrentFields = (props) => {
   const { t } = (0, import_react_i18next.useTranslation)();
   const { setState } = useResourceActionContext();
   const { resource, targetKey } = props.collectionResource || {};
-  const { [targetKey]: filterByTk, titleField } = useRecord();
+  const { [targetKey]: filterByTk, titleField, template: template2 } = useRecord();
   const [loadingRecord, setLoadingRecord] = import_react2.default.useState(null);
-  const { refreshCM, isTitleField } = useCollectionManager();
+  const { refreshCM, isTitleField, getTemplate } = useCollectionManager();
   const columns = [
     {
       dataIndex: ["uiSchema", "rawTitle"],
@@ -59327,16 +59334,17 @@ const InheritFields = (props) => {
 const CollectionFields = () => {
   const compile2 = useCompile();
   const field = (0, import_react.useField)();
-  const { name } = useRecord();
+  const { name, template: template2 } = useRecord();
   const {
     data: { database }
   } = useCurrentAppInfo();
-  const { getInterface, getInheritCollections, getCollection, getCurrentCollectionFields } = useCollectionManager();
+  const { getInterface, getInheritCollections, getCollection, getCurrentCollectionFields, getTemplate } = useCollectionManager();
   const form = (0, import_react2.useMemo)(() => (0, import_core2.createForm)(), []);
   const f = useAttach(form.createArrayField(__spreadProps(__spreadValues({}, field.props), { basePath: "" })));
   const { t } = (0, import_react_i18next.useTranslation)();
   const collectionResource = useResourceContext();
   const { refreshAsync } = (0, import_react2.useContext)(ResourceActionContext);
+  const targetTemplate = getTemplate(template2);
   const inherits = getInheritCollections(name);
   const columns = [
     {
@@ -59476,6 +59484,15 @@ const CollectionFields = () => {
           /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Action, __spreadValues({}, deleteProps)),
           /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SyncFieldsAction, __spreadValues({}, syncProps)),
           /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SyncSQLFieldsAction, { refreshCMList: refreshAsync }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+            SchemaComponent,
+            {
+              schema: {
+                type: "object",
+                properties: __spreadValues({}, targetTemplate.configureActions)
+              }
+            }
+          ),
           /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AddCollectionField, __spreadValues({}, addProps))
         ]
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client",
-  "version": "0.16.0-alpha.5",
+  "version": "0.16.0-alpha.6",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.mjs",
@@ -25,9 +25,9 @@
     "@formily/reactive-react": "^2.2.27",
     "@formily/shared": "^2.2.27",
     "@formily/validator": "^2.2.27",
-    "@nocobase/evaluators": "0.16.0-alpha.5",
-    "@nocobase/sdk": "0.16.0-alpha.5",
-    "@nocobase/utils": "0.16.0-alpha.5",
+    "@nocobase/evaluators": "0.16.0-alpha.6",
+    "@nocobase/sdk": "0.16.0-alpha.6",
+    "@nocobase/utils": "0.16.0-alpha.6",
     "@types/requirejs": "^2.1.34",
     "ahooks": "^3.7.2",
     "antd": "^5.8.6",
@@ -76,5 +76,5 @@
     "dumi": "^2.2.0",
     "dumi-theme-nocobase": "^0.2.14"
   },
-  "gitHead": "3badd2569e4658023897fa381ac4dd30e64d5bce"
+  "gitHead": "e8ad2328a8f85289cb19a7994d3fd726c7ae1720"
 }