@nocobase/client 0.9.2-alpha.1 → 0.9.2-alpha.3

package/lib/schema-component/antd/table-v2/Table.Column.Designer.js

@@ -19,12 +19,13 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 var useLabelFields = function useLabelFields(collectionName) {
   var _targetFields$filter, _targetFields$filter$, _targetFields$filter$2;
-  if (!collectionName) {
-    return [];
-  }
+  // 需要在组件顶层调用
   var compile = (0, _hooks.useCompile)();
   var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
     getCollectionFields = _useCollectionManager.getCollectionFields;
+  if (!collectionName) {
+    return [];
+  }
   var targetFields = getCollectionFields(collectionName);
   return targetFields === null || targetFields === void 0 ? void 0 : (_targetFields$filter = targetFields.filter) === null || _targetFields$filter === void 0 ? void 0 : (_targetFields$filter$ = _targetFields$filter.call(targetFields, function (field) {
     return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : field.target) && field.type !== 'boolean' && !field.isForeignKey;
@@ -61,9 +62,9 @@ var TableColumnDesigner = function TableColumnDesigner(props) {
       title: t('Custom column title'),
       properties: {
         title: {
-          // title: t('Column title'),
+          title: t('Column title'),
           default: columnSchema === null || columnSchema === void 0 ? void 0 : columnSchema.title,
-          description: "".concat(t('Original title: ')).concat((collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc = collectionField.uiSchema) === null || _collectionField$uiSc === void 0 ? void 0 : _collectionField$uiSc.title) || (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.title)),
+          description: "".concat(t('Original field title: ')).concat((collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc = collectionField.uiSchema) === null || _collectionField$uiSc === void 0 ? void 0 : _collectionField$uiSc.title) || (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.title)),
           'x-decorator': 'FormItem',
           'x-component': 'Input',
           'x-component-props': {}

package/lib/schema-component/antd/table-v2/Table.js

@@ -257,8 +257,8 @@ var Table = (0, _react.observer)(function (props) {
   }, [requiredValidator]);
   (0, _react2.useEffect)(function () {
     if (treeTable !== false) {
-      var _field$value2;
-      var keys = (0, _utils.getIdsWithChildren)((_field$value2 = field.value) === null || _field$value2 === void 0 ? void 0 : _field$value2.slice());
+      var _field$value2, _field$value2$slice;
+      var keys = (0, _utils.getIdsWithChildren)((_field$value2 = field.value) === null || _field$value2 === void 0 ? void 0 : (_field$value2$slice = _field$value2.slice) === null || _field$value2$slice === void 0 ? void 0 : _field$value2$slice.call(_field$value2));
       setAllIncludesChildren(keys);
     }
   }, [field.value]);

package/lib/schema-component/antd/upload/ReadPretty.js

@@ -144,7 +144,8 @@ ReadPretty.Upload = function (props) {
   return (field.value || []).map(function (item) {
     return /*#__PURE__*/_react2.default.createElement("div", null, item.url ? /*#__PURE__*/_react2.default.createElement("a", {
       target: '_blank',
-      href: item.url
+      href: item.url,
+      rel: "noreferrer"
     }, item.name) : /*#__PURE__*/_react2.default.createElement("span", null, item.name));
   });
 };

package/lib/schema-component/antd/variable/Input.js

@@ -153,7 +153,8 @@ function Input(props) {
     onChange = props.onChange,
     children = props.children,
     button = props.button,
-    useTypedConstant = props.useTypedConstant;
+    useTypedConstant = props.useTypedConstant,
+    style = props.style;
   var parsed = parseValue(value);
   var isConstant = typeof parsed === 'string';
   var type = isConstant ? parsed : '';
@@ -198,9 +199,14 @@ function Input(props) {
   var disabled = props.disabled || form.disabled;
   return /*#__PURE__*/_react2.default.createElement(_antd.Input.Group, {
     compact: true,
+    style: style,
     className: (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        width: auto;\n        display: flex !important;\n        .ant-input-disabled {\n          .ant-tag {\n            color: #bfbfbf;\n            border-color: #d9d9d9;\n          }\n        }\n        .ant-input.null-value {\n          width: 4em;\n          min-width: 4em;\n        }\n      "])))
+  }, /*#__PURE__*/_react2.default.createElement("div", {
+    style: {
+      flex: 1
+    }
   }, variable ? /*#__PURE__*/_react2.default.createElement("div", {
-    className: (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n            position: relative;\n            line-height: 0;\n\n            &:hover {\n              .ant-select-clear {\n                opacity: 0.8;\n              }\n            }\n\n            .ant-input {\n              overflow: auto;\n              white-space: nowrap;\n              ", "\n\n              .ant-tag {\n                display: inline;\n                line-height: 19px;\n                margin: 0;\n                padding: 2px 7px;\n                border-radius: 10px;\n              }\n            }\n          "])), disabled ? '' : 'padding-right: 28px;')
+    className: (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n              position: relative;\n              line-height: 0;\n\n              &:hover {\n                .ant-select-clear {\n                  opacity: 0.8;\n                }\n              }\n\n              .ant-input {\n                overflow: auto;\n                white-space: nowrap;\n                ", "\n\n                .ant-tag {\n                  display: inline;\n                  line-height: 19px;\n                  margin: 0;\n                  padding: 2px 7px;\n                  border-radius: 10px;\n                }\n              }\n            "])), disabled ? '' : 'padding-right: 28px;')
   }, /*#__PURE__*/_react2.default.createElement("div", {
     onInput: function onInput(e) {
       return e.preventDefault();
@@ -221,7 +227,7 @@ function Input(props) {
     contentEditable: false,
     color: "blue"
   }, variableText)), !disabled ? /*#__PURE__*/_react2.default.createElement("span", {
-    className: (0, _css.cx)('ant-select-clear', (0, _css.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n                  user-select: 'none';\n                "])))),
+    className: (0, _css.cx)('ant-select-clear', (0, _css.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n                    user-select: 'none';\n                  "])))),
     unselectable: "on",
     "aria-hidden": true,
     onClick: function onClick() {
@@ -230,7 +236,7 @@ function Input(props) {
   }, /*#__PURE__*/_react2.default.createElement(_icons.CloseCircleFilled, null)) : null) : children !== null && children !== void 0 ? children : /*#__PURE__*/_react2.default.createElement(ConstantComponent, {
     value: value,
     onChange: onChange
-  }), options.length > 1 ? /*#__PURE__*/_react2.default.createElement(_antd.Cascader, {
+  })), options.length > 1 ? /*#__PURE__*/_react2.default.createElement(_antd.Cascader, {
     options: options,
     value: variable !== null && variable !== void 0 ? variable : [''].concat(_toConsumableArray(children || !((_constantOption$child = constantOption.children) === null || _constantOption$child === void 0 ? void 0 : _constantOption$child.length) ? [] : [type])),
     onChange: onSwitch,

package/lib/schema-component/antd/variable/JSONInput.js

@@ -64,11 +64,11 @@ function JSONInput(props) {
     textArea.focus();
   }
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n      position: relative;\n      .ant-input{\n        width: 100%;\n      }\n    "])))
+    className: (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        position: relative;\n        .ant-input {\n          width: 100%;\n        }\n      "])))
   }, /*#__PURE__*/_react.default.createElement(_input.Input.JSON, _objectSpread(_objectSpread({}, props), {}, {
     ref: inputRef
   })), /*#__PURE__*/_react.default.createElement(_antd.Button.Group, {
-    className: (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n          position: absolute;\n          right: 0;\n          top: 0;\n          .ant-btn-sm{\n            font-size: 85%;\n          }\n        "])))
+    className: (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n          position: absolute;\n          right: 0;\n          top: 0;\n          .ant-btn-sm {\n            font-size: 85%;\n          }\n        "])))
   }, /*#__PURE__*/_react.default.createElement(_antd.Button, {
     onClick: onFormat
   }, t('Prettify')), /*#__PURE__*/_react.default.createElement(_VariableSelect.VariableSelect, {

package/lib/schema-component/antd/variable/TextArea.js

@@ -417,7 +417,7 @@ TextArea.ReadPretty = function (props) {
     dangerouslySetInnerHTML: {
       __html: html
     },
-    className: (0, _css.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n        overflow: auto;\n\n        .ant-tag {\n          display: inline;\n          line-height: 19px;\n          margin: 0 .25em;\n          padding: 2px 7px;\n          border-radius: 10px;\n        }\n      "])))
+    className: (0, _css.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n        overflow: auto;\n\n        .ant-tag {\n          display: inline;\n          line-height: 19px;\n          margin: 0 0.25em;\n          padding: 2px 7px;\n          border-radius: 10px;\n        }\n      "])))
   });
   return /*#__PURE__*/_react.default.createElement(_2.EllipsisWithTooltip, {
     ellipsis: true,

package/lib/schema-component/antd/variable/VariableSelect.js

@@ -32,9 +32,9 @@ function VariableSelect(props) {
     setSelectedVar([]);
   }, [options]);
   return /*#__PURE__*/_react.default.createElement(_antd.Button, {
-    className: (0, _css.cx)('x-button', (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n      position: relative;\n\n      .ant-select.ant-cascader{\n        position: absolute;\n        top: -1px;\n        left: -1px;\n        min-width: auto;\n        width: calc(100% + 2px);\n        height: calc(100% + 2px);\n        overflow: hidden;\n        opacity: 0;\n      }\n    "]))))
+    className: (0, _css.cx)('x-button', (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          position: relative;\n\n          .ant-select.ant-cascader {\n            position: absolute;\n            top: -1px;\n            left: -1px;\n            min-width: auto;\n            width: calc(100% + 2px);\n            height: calc(100% + 2px);\n            overflow: hidden;\n            opacity: 0;\n          }\n        "]))))
   }, /*#__PURE__*/_react.default.createElement("span", {
-    className: (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n          font-style: italic;\n          font-family: \"New York\", \"Times New Roman\", Times, serif;\n        "])))
+    className: (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n          font-style: italic;\n          font-family: 'New York', 'Times New Roman', Times, serif;\n        "])))
   }, "x"), /*#__PURE__*/_react.default.createElement(_antd.Cascader, {
     placeholder: t('Select a variable'),
     value: [],
@@ -64,10 +64,10 @@ function VariableSelect(props) {
         }
       }
     },
-    dropdownClassName: (0, _css.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n          .ant-cascader-menu{\n            margin-bottom: 0;\n          }\n        "]))),
+    dropdownClassName: (0, _css.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n          .ant-cascader-menu {\n            margin-bottom: 0;\n          }\n        "]))),
     dropdownRender: function dropdownRender(menu) {
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, menu, /*#__PURE__*/_react.default.createElement("div", {
-        className: (0, _css.css)(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n                padding: .5em;\n                border-top: 1px solid rgba(0, 0, 0, .06);\n                color: rgba(0, 0, 0, .45);\n              "])))
+        className: (0, _css.css)(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n                padding: 0.5em;\n                border-top: 1px solid rgba(0, 0, 0, 0.06);\n                color: rgba(0, 0, 0, 0.45);\n              "])))
       }, t('Double click to choose entire object')));
     }
   }));

package/lib/schema-component/antd/variable/XButton.d.ts

@@ -1,4 +1,4 @@
-import React from "react";
+import React from 'react';
 export declare const XButton: React.ForwardRefExoticComponent<Partial<{
     href: string;
     target?: string;

package/lib/schema-component/antd/variable/XButton.js

@@ -20,7 +20,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 var XButton = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   return /*#__PURE__*/_react.default.createElement(_antd.Button, _objectSpread({
     ref: ref,
-    className: (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n      font-style: italic;\n      font-family: \"New York\", \"Times New Roman\", Times, serif;\n    "])))
+    className: (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n      font-style: italic;\n      font-family: 'New York', 'Times New Roman', Times, serif;\n    "])))
   }, props), "x");
 });
 exports.XButton = XButton;

package/lib/schema-component/common/utils/uitls.d.ts

@@ -1 +1,10 @@
+declare type VariablesCtx = {
+    /** 当前登录的用户 */
+    $user: Record<string, any>;
+    $date: Record<string, any>;
+};
+export declare const useVariablesCtx: () => VariablesCtx;
+export declare const isVariable: (str: unknown) => boolean;
+export declare const parseVariables: (str: string, ctx: VariablesCtx) => any;
 export declare const conditionAnalyse: (rules: any, values: any) => boolean;
+export {};

package/lib/schema-component/common/utils/uitls.js

@@ -3,15 +3,54 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.conditionAnalyse = void 0;
-var _lodash = require("lodash");
+exports.useVariablesCtx = exports.parseVariables = exports.isVariable = exports.conditionAnalyse = void 0;
 var _flat2 = _interopRequireDefault(require("flat"));
+var _lodash = _interopRequireWildcard(require("lodash"));
+var _moment = _interopRequireDefault(require("moment"));
+var _user = require("../../../user");
 var _logic = _interopRequireDefault(require("../../common/utils/logic"));
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+var useVariablesCtx = function useVariablesCtx() {
+  var _ref = (0, _user.useCurrentUserContext)() || {},
+    data = _ref.data;
+  return {
+    $user: (data === null || data === void 0 ? void 0 : data.data) || {},
+    $date: {
+      now: function now() {
+        return (0, _moment.default)().toISOString();
+      }
+    }
+  };
+};
+exports.useVariablesCtx = useVariablesCtx;
+var isVariable = function isVariable(str) {
+  var _str$match;
+  if (typeof str !== 'string') {
+    return false;
+  }
+  var regex = /{{(.*?)}}/;
+  var matches = str === null || str === void 0 ? void 0 : (_str$match = str.match) === null || _str$match === void 0 ? void 0 : _str$match.call(str, regex);
+  return matches ? true : false;
+};
+exports.isVariable = isVariable;
+var parseVariables = function parseVariables(str, ctx) {
+  var _str$match2;
+  var regex = /{{(.*?)}}/;
+  var matches = str === null || str === void 0 ? void 0 : (_str$match2 = str.match) === null || _str$match2 === void 0 ? void 0 : _str$match2.call(str, regex);
+  if (matches) {
+    var result = _lodash.default.get(ctx, matches[1]);
+    return _lodash.default.isFunction(result) ? result() : result;
+  } else {
+    return str;
+  }
+};
+exports.parseVariables = parseVariables;
 function getInnermostKeyAndValue(obj) {
   if (_typeof(obj) !== 'object' || obj === null) {
     return null;
@@ -31,9 +70,9 @@ function getInnermostKeyAndValue(obj) {
   return null;
 }
 var getValue = function getValue(str, values) {
-  var _str$match;
+  var _str$match3;
   var regex = /{{(.*?)}}/;
-  var matches = str === null || str === void 0 ? void 0 : (_str$match = str.match) === null || _str$match === void 0 ? void 0 : _str$match.call(str, regex);
+  var matches = str === null || str === void 0 ? void 0 : (_str$match3 = str.match) === null || _str$match3 === void 0 ? void 0 : _str$match3.call(str, regex);
   if (matches) {
     return getVariableValue(str, values);
   } else {

package/lib/schema-component/core/DesignableSwitch.js

@@ -25,7 +25,9 @@ var DesignableSwitch = function DesignableSwitch() {
   (0, _reactHotkeysHook.useHotkeys)('Ctrl+Shift+U', function () {
     return setDesignable(!designable);
   }, [designable]);
-  return /*#__PURE__*/_react.default.createElement(_antd.Button
+  return /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
+    title: t('UI Editor')
+  }, /*#__PURE__*/_react.default.createElement(_antd.Button
   // selected={designable}
   , {
     // selected={designable}
@@ -36,6 +38,6 @@ var DesignableSwitch = function DesignableSwitch() {
     onClick: function onClick() {
       setDesignable(!designable);
     }
-  });
+  }));
 };
 exports.DesignableSwitch = DesignableSwitch;

package/lib/schema-component/hooks/useComponent.js

@@ -8,14 +8,14 @@ var _react = require("@formily/react");
 var _lodash = require("lodash");
 var _react2 = require("react");
 var useComponent = function useComponent(component, defaults) {
+  var _useContext = (0, _react2.useContext)(_react.SchemaOptionsContext),
+    components = _useContext.components;
   if (!component) {
     return defaults;
   }
   if (typeof component !== 'string') {
     return component;
   }
-  var _useContext = (0, _react2.useContext)(_react.SchemaOptionsContext),
-    components = _useContext.components;
   return (0, _lodash.get)(components, component) || defaults;
 };
 exports.useComponent = useComponent;

package/lib/schema-component/hooks/useDesignable.js

@@ -150,10 +150,10 @@ var Designable = /*#__PURE__*/function () {
                 onSuccess = _ref.onSuccess, current = _ref.current, position = _ref.position, schema = _ref.schema, wrap = _ref.wrap, wrapped = _ref.wrapped, removed = _ref.removed;
                 schemas = [];
                 if ((wrapped === null || wrapped === void 0 ? void 0 : wrapped['x-component']) === 'Grid.Col') {
-                  schemas = updateColumnSize(wrapped.parent);
+                  schemas = schemas.concat(updateColumnSize(wrapped.parent));
                 }
                 if ((removed === null || removed === void 0 ? void 0 : removed['x-component']) === 'Grid.Col') {
-                  schemas = updateColumnSize(removed.parent);
+                  schemas = schemas.concat(updateColumnSize(removed.parent));
                 }
                 refresh();
                 if (current['x-uid']) {

package/lib/schema-initializer/SchemaInitializer.js

@@ -141,8 +141,8 @@ SchemaInitializer.Button = (0, _react.observer)(function (props) {
     className: (0, _classnames.default)('nb-schema-initializer-button'),
     openClassName: "nb-schema-initializer-button-open",
     overlayClassName: (0, _classnames.default)('nb-schema-initializer-button-overlay', (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n            .ant-dropdown-menu-item-group-list {\n              max-height: 40vh;\n              overflow: auto;\n            }\n          "])))),
-    visible: visible,
-    onVisibleChange: function onVisibleChange(visible) {
+    open: visible,
+    onOpenChange: function onOpenChange(visible) {
       setVisible(visible);
     }
   }, dropdown), {}, {

package/lib/schema-initializer/buttons/BulkEditFormItemInitializers.js

@@ -26,13 +26,20 @@ var BulkEditFormItemInitializers = function BulkEditFormItemInitializers(props)
       type: 'itemGroup',
       title: t('Display fields'),
       children: (0, _utils.useCustomBulkEditFormItemInitializerFields)()
-    }], associationFields.length > 0 ? [{
-      type: 'divider'
-    }, {
-      type: 'itemGroup',
-      title: t('Display association fields'),
-      children: associationFields
-    }] : [], [{
+    }],
+    // associationFields.length > 0
+    //   ? [
+    //       {
+    //         type: 'divider',
+    //       },
+    //       {
+    //         type: 'itemGroup',
+    //         title: t('Display association fields'),
+    //         children: associationFields,
+    //       },
+    //     ]
+    //   : [],
+    [{
       type: 'divider'
     }, {
       type: 'item',

package/lib/schema-initializer/utils.js

@@ -360,10 +360,10 @@ var useFilterFormItemInitializerFields = function useFilterFormItemInitializerFi
       var _field$uiSchema5;
       schema = {
         type: 'string',
-        name: field.name,
+        name: "".concat(field.name),
         required: false,
-        'x-designer': 'AssociationSelect.FilterDesigner',
-        'x-component': 'AssociationSelect',
+        'x-designer': 'FormItem.FilterFormDesigner',
+        'x-component': 'CollectionField',
         'x-decorator': 'FormItem',
         'x-collection-field': "".concat(name, ".").concat(field.name),
         'x-component-props': (_field$uiSchema5 = field.uiSchema) === null || _field$uiSchema5 === void 0 ? void 0 : _field$uiSchema5['x-component-props']
@@ -464,7 +464,12 @@ var getItem = function getItem(field, schemaName, collectionName, getCollectionF
       type: 'subMenu',
       title: (_field$uiSchema8 = field.uiSchema) === null || _field$uiSchema8 === void 0 ? void 0 : _field$uiSchema8.title,
       children: subFields.map(function (subField) {
-        return getItem(subField, "".concat(schemaName, ".").concat(subField.name), collectionName, getCollectionFields, [].concat(_toConsumableArray(processedCollections), [field.target]));
+        return (
+          // 使用 | 分隔，是为了防止 form.values 中出现 { a: { b: 1 } } 的情况
+          // 使用 | 分隔后，form.values 中会出现 { 'a|b': 1 } 的情况，这种情况下
+          // 就可以知道该字段是一个关系字段中的输入框，进而特殊处理
+          getItem(subField, "".concat(schemaName, ".").concat(subField.name), collectionName, getCollectionFields, [].concat(_toConsumableArray(processedCollections), [field.target]))
+        );
       }).filter(Boolean)
     };
   }
@@ -509,8 +514,7 @@ var useFilterAssociatedFormItemInitializerFields = function useFilterAssociatedF
 exports.useFilterAssociatedFormItemInitializerFields = useFilterAssociatedFormItemInitializerFields;
 var useInheritsFormItemInitializerFields = function useInheritsFormItemInitializerFields(options) {
   var _useCollection8 = (0, _collectionManager.useCollection)(),
-    name = _useCollection8.name,
-    template = _useCollection8.template;
+    name = _useCollection8.name;
   var _useCollectionManager8 = (0, _collectionManager.useCollectionManager)(),
     getInterface = _useCollectionManager8.getInterface,
     getInheritCollections = _useCollectionManager8.getInheritCollections,
@@ -519,17 +523,17 @@ var useInheritsFormItemInitializerFields = function useInheritsFormItemInitializ
   var inherits = getInheritCollections(name);
   var _useActionContext3 = (0, _schemaComponent.useActionContext)(),
     snapshot = _useActionContext3.snapshot;
+  var form = (0, _react.useForm)();
   return inherits === null || inherits === void 0 ? void 0 : inherits.map(function (v) {
     var _fields$filter4;
     var fields = getParentCollectionFields(v, name);
-    var form = (0, _react.useForm)();
     var _ref5 = options || {},
       _ref5$readPretty = _ref5.readPretty,
       readPretty = _ref5$readPretty === void 0 ? form.readPretty : _ref5$readPretty,
       _ref5$block = _ref5.block,
       block = _ref5$block === void 0 ? 'Form' : _ref5$block;
     var targetCollection = getCollection(v);
-    return _defineProperty({}, targetCollection.title, fields === null || fields === void 0 ? void 0 : (_fields$filter4 = fields.filter(function (field) {
+    return _defineProperty({}, targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.title, fields === null || fields === void 0 ? void 0 : (_fields$filter4 = fields.filter(function (field) {
       return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : field.isForeignKey);
     })) === null || _fields$filter4 === void 0 ? void 0 : _fields$filter4.map(function (field) {
       var _field$uiSchema10, _field$uiSchema11, _field$uiSchema12;
@@ -843,7 +847,8 @@ var useCollectionDataSourceItems = function useCollectionDataSourceItems(compone
   var _useTranslation2 = (0, _reactI18next.useTranslation)(),
     t = _useTranslation2.t;
   var _useCollectionManager12 = (0, _collectionManager.useCollectionManager)(),
-    collections = _useCollectionManager12.collections;
+    collections = _useCollectionManager12.collections,
+    getCollectionFields = _useCollectionManager12.getCollectionFields;
   var _useSchemaTemplateMan2 = (0, _schemaTemplates.useSchemaTemplateManager)(),
     getTemplatesByCollection = _useSchemaTemplateMan2.getTemplatesByCollection;
   var _useState = (0, _react2.useState)([]),
@@ -870,7 +875,9 @@ var useCollectionDataSourceItems = function useCollectionDataSourceItems(compone
       var b = !value || selected.includes(item.name);
       if (item.inherit) {
         return false;
-      } else if (item.autoGenId === false && !item.fields.find(function (v) {
+      }
+      var fields = getCollectionFields(item.name);
+      if (item.autoGenId === false && !fields.find(function (v) {
         return v.primaryKey;
       })) {
         return false;

package/lib/schema-settings/DataTemplates/FormDataTemplates.js

@@ -7,6 +7,8 @@ exports.FormDataTemplates = void 0;
 var _react = require("@formily/react");
 var _antd = require("antd");
 var _react2 = _interopRequireDefault(require("react"));
+var _reactI18next = require("react-i18next");
+var _collectionManager = require("../../collection-manager");
 var _schemaComponent = require("../../schema-component");
 var _AsDefaultTemplate = require("./components/AsDefaultTemplate");
 var _DataTemplateTitle = require("./components/DataTemplateTitle");
@@ -25,6 +27,13 @@ var FormDataTemplates = (0, _react.observer)(function (props) {
   var _useCollectionState = (0, _useCollectionState2.useCollectionState)(collectionName),
     collectionList = _useCollectionState.collectionList,
     getEnableFieldTree = _useCollectionState.getEnableFieldTree;
+  var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
+    getCollection = _useCollectionManager.getCollection,
+    getCollectionField = _useCollectionManager.getCollectionField;
+  var collection = getCollection(collectionName);
+  var _useTranslation = (0, _reactI18next.useTranslation)(),
+    t = _useTranslation.t;
+  var field = getCollectionField("".concat(collectionName, ".").concat((collection === null || collection === void 0 ? void 0 : collection.titleField) || 'id'));
   return /*#__PURE__*/_react2.default.createElement(_schemaComponent.SchemaComponent, {
     components: {
       ArrayCollapse: _DataTemplateTitle.ArrayCollapse
@@ -62,7 +71,7 @@ var FormDataTemplates = (0, _react.observer)(function (props) {
                     type: 'string',
                     title: '{{ t("Collection") }}',
                     required: true,
-                    description: '当前表有继承关系时，可选择继承链路上的表作为模板来源',
+                    description: t('If collection inherits, choose inherited collections as templates'),
                     default: collectionName,
                     'x-display': collectionList.length > 1 ? 'visible' : 'hidden',
                     'x-decorator': 'FormItem',
@@ -75,7 +84,7 @@ var FormDataTemplates = (0, _react.observer)(function (props) {
                     type: 'number',
                     title: '{{ t("Template Data") }}',
                     required: true,
-                    description: '选择一条已有的数据作为表单的初始化数据',
+                    description: t('Select an existing piece of data as the initialization data for the form'),
                     'x-decorator': 'FormItem',
                     'x-component': _schemaComponent.AssociationSelect,
                     'x-component-props': {
@@ -86,16 +95,20 @@ var FormDataTemplates = (0, _react.observer)(function (props) {
                       multiple: false,
                       objectValue: false,
                       manual: false,
-                      mapOptions: function mapOptions(item) {
-                        // TODO: 应该使用 item.title 字段的值作为 label
-                        return {
-                          label: item.id,
-                          value: item.id
-                        };
+                      targetField: field,
+                      mapOptions: function mapOptions(option) {
+                        try {
+                          var label = getLabel(collection);
+                          option[label] = /*#__PURE__*/_react2.default.createElement(_react2.default.Fragment, null, "#", option.id, " ", option[label]);
+                          return option;
+                        } catch (error) {
+                          console.error(error);
+                          return option;
+                        }
                       },
                       fieldNames: {
-                        label: 'label',
-                        value: 'value'
+                        label: getLabel(collection),
+                        value: 'id'
                       }
                     },
                     'x-reactions': [{
@@ -116,7 +129,7 @@ var FormDataTemplates = (0, _react.observer)(function (props) {
                     type: 'array',
                     title: '{{ t("Data fields") }}',
                     required: true,
-                    description: '仅选择的字段才会作为表单的初始化数据',
+                    description: t('Only the selected fields will be used as the initialization data for the form'),
                     'x-decorator': 'FormItem',
                     'x-component': Tree,
                     'x-component-props': {
@@ -179,4 +192,7 @@ var FormDataTemplates = (0, _react.observer)(function (props) {
     }
   });
 });
-exports.FormDataTemplates = FormDataTemplates;
+exports.FormDataTemplates = FormDataTemplates;
+function getLabel(collection) {
+  return !(collection === null || collection === void 0 ? void 0 : collection.titleField) || collection.titleField === 'id' ? 'label' : collection === null || collection === void 0 ? void 0 : collection.titleField;
+}

package/lib/schema-settings/DataTemplates/hooks/useCollectionState.js

@@ -35,8 +35,9 @@ var useCollectionState = function useCollectionState(currentCollectionName) {
   function getCollectionList() {
     var collections = getAllCollectionsInheritChain(currentCollectionName);
     return collections.map(function (name) {
+      var _getCollection;
       return {
-        label: getCollection(name).title,
+        label: (_getCollection = getCollection(name)) === null || _getCollection === void 0 ? void 0 : _getCollection.title,
         value: name
       };
     });

package/lib/schema-settings/LinkageRules/FilterDynamicComponent.d.ts

@@ -1,2 +1,9 @@
-/// <reference types="react" />
-export declare function FilterDynamicComponent(props: any): JSX.Element;
+import React from 'react';
+declare type Props = {
+    value: any;
+    onChange: (value: any) => void;
+    renderSchemaComponent: () => React.ReactNode;
+    collectionName: string;
+};
+export declare function FilterDynamicComponent(props: Props): JSX.Element;
+export {};

package/lib/schema-settings/LinkageRules/ValueDynamicComponent.js

@@ -94,7 +94,8 @@ var ValueDynamicComponent = function ValueDynamicComponent(props) {
     className: 'ant-formily-item-extra'
   }, t('Syntax references'), ":"), /*#__PURE__*/_react.default.createElement("a", {
     href: "https://formulajs.info/functions/",
-    target: "_blank"
+    target: "_blank",
+    rel: "noreferrer"
   }, "Formula.js"))) : null);
 };
 exports.ValueDynamicComponent = ValueDynamicComponent;

package/lib/schema-settings/SchemaSettings.d.ts

@@ -2,7 +2,7 @@ import { GeneralField } from '@formily/core';
 import { ISchema, Schema } from '@formily/react';
 import { CascaderProps, MenuItemProps } from 'antd';
 import React from 'react';
-import { Designable } from '..';
+import { CollectionFieldOptions, Designable } from '..';
 interface SchemaSettingsProps {
     title?: any;
     dn?: Designable;
@@ -56,4 +56,7 @@ interface SwitchItemProps extends Omit<MenuItemProps, 'onChange'> {
 export declare const useDataTemplates: () => {
     templateData: any;
 };
+export declare const isShowDefaultValue: (collectionField: CollectionFieldOptions, getInterface: any) => boolean;
+export declare const isSystemField: (collectionField: CollectionFieldOptions, getInterface: any) => boolean;
+export declare const isPatternDisabled: (fieldSchema: Schema) => boolean;
 export {};