@nocobase/client 0.7.2-alpha.5 → 0.7.3-alpha.1

package/lib/locale/zh_CN.d.ts

@@ -98,6 +98,7 @@ declare const _default: {
     Update: string;
     View: string;
     "View record": string;
+    Refresh: string;
     "Data changes": string;
     "Field name": string;
     "Before change": string;
@@ -232,6 +233,24 @@ declare const _default: {
     "Label field": string;
     "Default is the ID field": string;
     "Set default sorting rules": string;
+    "Set validation rules": string;
+    "Max length": string;
+    "Min length": string;
+    Maximum: string;
+    Minimum: string;
+    "Max length must greater than min length": string;
+    "Min length must less than max length": string;
+    "Maximum must greater than minimum": string;
+    "Minimum must less than maximum": string;
+    "Validation rule": string;
+    "Add validation rule": string;
+    Format: string;
+    "Regular expression": string;
+    "Error message": string;
+    Length: string;
+    "The field value cannot be greater than ": string;
+    "The field value cannot be less than ": string;
+    "The field value is not an integer number": string;
     "is before": string;
     "is after": string;
     "is on or after": string;
@@ -539,6 +558,7 @@ declare const _default: {
     'Dynamic value': string;
     'Current user': string;
     'Current record': string;
+    'Current time': string;
     'Popup close method': string;
     'Automatic close': string;
     'Manually close': string;
@@ -573,5 +593,8 @@ declare const _default: {
     "One to one (belongs to)": string;
     "Use the same time zone (GMT) for all users": string;
     "Province/city/area name": string;
+    "Enabled languages": string;
+    "View all plugins": string;
+    Print: string;
 };
 export default _default;

package/lib/locale/zh_CN.js

@@ -104,6 +104,7 @@ var _default = {
   "Update": "更新",
   "View": "查看",
   "View record": "查看数据",
+  "Refresh": "刷新",
   "Data changes": "数据变更",
   "Field name": "字段标识",
   "Before change": "变更前",
@@ -238,6 +239,24 @@ var _default = {
   "Label field": "标签字段",
   "Default is the ID field": "默认为 ID 字段",
   "Set default sorting rules": "设置排序规则",
+  "Set validation rules": "设置验证规则",
+  "Max length": "最大长度",
+  "Min length": "最小长度",
+  "Maximum": "最大值",
+  "Minimum": "最小值",
+  "Max length must greater than min length": "最大长度必须大于最小长度",
+  "Min length must less than max length": "最小长度必须小于最大长度",
+  "Maximum must greater than minimum": "最大值必须大于最小值",
+  "Minimum must less than maximum": "最小值必须小于最大值",
+  "Validation rule": "验证规则",
+  "Add validation rule": "新增验证规则",
+  "Format": "格式",
+  "Regular expression": "正则表达式",
+  "Error message": "错误消息",
+  "Length": "长度",
+  "The field value cannot be greater than ": "数值不能大于",
+  "The field value cannot be less than ": "数值不能小于",
+  "The field value is not an integer number": "数字不是整数",
   "is before": "早于",
   "is after": "晚于",
   "is on or after": "不早于",
@@ -546,6 +565,7 @@ var _default = {
   'Dynamic value': '动态值',
   'Current user': '当前用户',
   'Current record': '当前记录',
+  'Current time': '当前时间',
   'Popup close method': '弹窗关闭方式',
   'Automatic close': '自动关闭',
   'Manually close': '手动关闭',
@@ -580,6 +600,9 @@ var _default = {
   "One to one (has one)": "一对一（has one）",
   "One to one (belongs to)": "一对一（belongs to）",
   "Use the same time zone (GMT) for all users": "所有用户使用同一时区 (格林尼治标准时间)",
-  "Province/city/area name": "省市区名称"
+  "Province/city/area name": "省市区名称",
+  "Enabled languages": "启用的语言",
+  "View all plugins": "查看所有插件",
+  "Print": "打印"
 };
 exports.default = _default;

package/lib/plugin-manager/PluginManager.js

@@ -17,6 +17,8 @@ var _lodash = require("lodash");
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _reactI18next = require("react-i18next");
+
 var _apiClient = require("../api-client");
 
 var _context = require("./context");
@@ -107,6 +109,9 @@ PluginManager.Toolbar = function (props) {
       pinned = _splitItems2[0],
       unpinned = _splitItems2[1];
 
+  var _useTranslation = (0, _reactI18next.useTranslation)(),
+      t = _useTranslation.t;
+
   return /*#__PURE__*/_react.default.createElement("div", {
     style: {
       display: 'inline-block'
@@ -127,7 +132,7 @@ PluginManager.Toolbar = function (props) {
   }), unpinned.length > 0 && /*#__PURE__*/_react.default.createElement(_antd.Menu.SubMenu, {
     popupClassName: 'pm-sub-menu',
     key: 'more',
-    title: /*#__PURE__*/_react.default.createElement(_icons.MoreOutlined, null)
+    title: /*#__PURE__*/_react.default.createElement(_icons.EllipsisOutlined, null)
   }, unpinned.map(function (item, index) {
     var Action = (0, _lodash.get)(components, item.component);
     return Action && /*#__PURE__*/_react.default.createElement(ToolbarItemContext.Provider, {
@@ -139,8 +144,8 @@ PluginManager.Toolbar = function (props) {
   }), /*#__PURE__*/_react.default.createElement(_antd.Menu.Item, {
     key: 'plugins',
     disabled: true,
-    icon: /*#__PURE__*/_react.default.createElement(_icons.SettingOutlined, null)
-  }, "\u7BA1\u7406\u63D2\u4EF6"))));
+    icon: /*#__PURE__*/_react.default.createElement(_icons.AppstoreOutlined, null)
+  }, t('View all plugins')))));
 };
 
 PluginManager.Toolbar.Item = function (props) {

package/lib/schema-component/antd/action/Action.Modal.js

@@ -68,7 +68,7 @@ var ActionModal = (0, _react.observer)(function (props) {
     onCancel: function onCancel() {
       return setVisible(false, true);
     },
-    className: (0, _classnames.default)(others.className, (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n                &.nb-action-popup {\n                  .ant-modal-body {\n                    background: #f0f2f5;\n                  }\n                }\n              "])))),
+    className: (0, _classnames.default)(others.className, (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n                &.nb-action-popup {\n                  .ant-modal-header {\n                    display: none;\n                  }\n                  .ant-modal-body {\n                    padding-top: 16px;\n                  }\n                  .ant-modal-body {\n                    background: #f0f2f5;\n                  }\n                  .ant-modal-close-x {\n                    width: 32px;\n                    height: 32px;\n                    line-height: 32px;\n                  }\n                }\n              "])))),
     footer: footerSchema ? /*#__PURE__*/_react2.default.createElement("div", {
       className: (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n                    display: flex;\n                    justify-content: flex-end;\n                    width: 100%;\n                    .ant-btn {\n                      margin-right: 8px;\n                    }\n                  "])))
     }, /*#__PURE__*/_react2.default.createElement(_react.RecursionField, {

package/lib/schema-component/antd/form-item/FormItem.js

@@ -1,5 +1,7 @@
 "use strict";
 
+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); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -17,7 +19,7 @@ var _react2 = _interopRequireDefault(require("react"));
 
 var _reactI18next = require("react-i18next");
 
-var _ = require("../..");
+var _2 = require("../..");
 
 var _blockProvider = require("../../../block-provider");
 
@@ -29,10 +31,22 @@ var _blockItem = require("../block-item");
 
 var _shared2 = require("../input/shared");
 
+var _ = _interopRequireWildcard(require("lodash"));
+
 var _templateObject;
 
+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 _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -67,7 +81,7 @@ var FormItem = function FormItem(props) {
 exports.FormItem = FormItem;
 
 FormItem.Designer = function (props) {
-  var _collectionField$uiSc, _collectionField$uiSc2, _fieldSchema$xDecora, _field$componentProps, _field$componentProps2;
+  var _interfaceConfig$vali, _collectionField$uiSc, _collectionField$uiSc2, _fieldSchema$xDecora, _fieldSchema$xCompon, _field$componentProps, _field$componentProps2;
 
   var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
       getCollectionFields = _useCollectionManager.getCollectionFields,
@@ -89,15 +103,16 @@ FormItem.Designer = function (props) {
   var _useTranslation = (0, _reactI18next.useTranslation)(),
       t = _useTranslation.t;
 
-  var _useDesignable = (0, _.useDesignable)(),
+  var _useDesignable = (0, _2.useDesignable)(),
       dn = _useDesignable.dn,
       refresh = _useDesignable.refresh,
       insertAdjacent = _useDesignable.insertAdjacent,
       insertBeforeBegin = _useDesignable.insertBeforeBegin;
 
-  var compile = (0, _.useCompile)();
+  var compile = (0, _2.useCompile)();
   var collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
   var interfaceConfig = getInterface(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface);
+  var validateSchema = interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$vali = interfaceConfig['validateSchema']) === null || _interfaceConfig$vali === void 0 ? void 0 : _interfaceConfig$vali.call(interfaceConfig, fieldSchema);
   var originalTitle = collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc = collectionField.uiSchema) === null || _collectionField$uiSc === void 0 ? void 0 : _collectionField$uiSc.title;
   var targetFields = (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) ? getCollectionFields(collectionField.target) : [];
   var isSubFormAssocitionField = field.address.segments.includes('__form_grid');
@@ -233,6 +248,151 @@ FormItem.Designer = function (props) {
       });
       refresh();
     }
+  }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && validateSchema && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
+    title: t('Set validation rules'),
+    components: {
+      ArrayCollapse: _antd.ArrayCollapse,
+      FormLayout: _antd.FormLayout
+    },
+    schema: {
+      type: 'object',
+      title: t('Set validation rules'),
+      properties: {
+        rules: {
+          type: 'array',
+          default: fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-validator'],
+          'x-component': 'ArrayCollapse',
+          'x-decorator': 'FormItem',
+          'x-component-props': {
+            accordion: true
+          },
+          maxItems: 3,
+          items: {
+            type: 'object',
+            'x-component': 'ArrayCollapse.CollapsePanel',
+            'x-component-props': {
+              header: '{{ t("Validation rule") }}'
+            },
+            properties: {
+              index: {
+                type: 'void',
+                'x-component': 'ArrayCollapse.Index'
+              },
+              layout: {
+                type: 'void',
+                'x-component': 'FormLayout',
+                'x-component-props': {
+                  labelStyle: {
+                    marginTop: '6px'
+                  },
+                  labelCol: 8,
+                  wrapperCol: 16
+                },
+                properties: _objectSpread(_objectSpread({}, validateSchema), {}, {
+                  message: {
+                    type: 'string',
+                    title: '{{ t("Error message") }}',
+                    'x-decorator': 'FormItem',
+                    'x-component': 'Input.TextArea',
+                    'x-component-props': {
+                      autoSize: {
+                        minRows: 2,
+                        maxRows: 2
+                      }
+                    }
+                  }
+                })
+              },
+              remove: {
+                type: 'void',
+                'x-component': 'ArrayCollapse.Remove'
+              },
+              moveUp: {
+                type: 'void',
+                'x-component': 'ArrayCollapse.MoveUp'
+              },
+              moveDown: {
+                type: 'void',
+                'x-component': 'ArrayCollapse.MoveDown'
+              }
+            }
+          },
+          properties: {
+            add: {
+              type: 'void',
+              title: '{{ t("Add validation rule") }}',
+              'x-component': 'ArrayCollapse.Addition',
+              'x-reactions': {
+                dependencies: ['rules'],
+                fulfill: {
+                  state: {
+                    disabled: '{{$deps[0].length >= 3}}'
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    onSubmit: function onSubmit(v) {
+      var _collectionField$uiSc3;
+
+      var rules = [];
+
+      var _iterator = _createForOfIteratorHelper(v.rules),
+          _step;
+
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var _rule = _step.value;
+          rules.push(_.pickBy(_rule, _.identity));
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+
+      var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']); // return;
+      // if (['number'].includes(collectionField?.interface) && collectionField?.uiSchema?.['x-component-props']?.['stringMode'] === true) {
+      //   rules['numberStringMode'] = true;
+      // }
+
+
+      if (['percent'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface)) {
+        var _iterator2 = _createForOfIteratorHelper(rules),
+            _step2;
+
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var rule = _step2.value;
+
+            if (!!rule.maxValue || !!rule.minValue) {
+              rule['percentMode'] = true;
+            }
+
+            if (rule.percentFormat) {
+              rule['percentFormats'] = true;
+            }
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
+        }
+      }
+
+      var concatValidator = _.concat([], (collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc3 = collectionField.uiSchema) === null || _collectionField$uiSc3 === void 0 ? void 0 : _collectionField$uiSc3['x-validator']) || [], rules);
+
+      field.validator = concatValidator;
+      fieldSchema['x-validator'] = rules;
+      schema['x-validator'] = rules;
+      dn.emit('patch', {
+        schema: schema
+      });
+      refresh();
+    }
   }), form && !isSubFormAssocitionField && ['o2o', 'oho', 'obo', 'o2m'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
     title: t('Field component'),
     options: (collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) === 'o2m' ? [{
@@ -279,7 +439,7 @@ FormItem.Designer = function (props) {
         }
       });
     }
-  }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && (collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) !== 'o2m' && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
+  }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && (collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) !== 'o2m' && (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon['pattern-disable']) != true && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
     key: "pattern",
     title: t('Pattern'),
     options: [{

package/lib/schema-component/antd/grid/Grid.js

@@ -55,7 +55,17 @@ var GridRowContext = /*#__PURE__*/(0, _react2.createContext)(null);
 var GridColContext = /*#__PURE__*/(0, _react2.createContext)(null);
 var GridContext = /*#__PURE__*/(0, _react2.createContext)({});
 
+var breakRemoveOnGrid = function breakRemoveOnGrid(s) {
+  return s['x-component'] === 'Grid';
+};
+
+var breakRemoveOnRow = function breakRemoveOnRow(s) {
+  return s['x-component'] === 'Grid.Row';
+};
+
 var ColDivider = function ColDivider(props) {
+  var _dndContext$active, _dndContext$active$da, _dndContext$active$da2;
+
   var _useDroppable = (0, _core.useDroppable)({
     id: props.id,
     data: props.data
@@ -66,14 +76,31 @@ var ColDivider = function ColDivider(props) {
   var droppableStyle = {
     backgroundColor: isOver ? 'rgba(241, 139, 98, .1)' : undefined
   };
+  var dndContext = (0, _core.useDndContext)();
+  var activeSchema = (_dndContext$active = dndContext.active) === null || _dndContext$active === void 0 ? void 0 : (_dndContext$active$da = _dndContext$active.data.current) === null || _dndContext$active$da === void 0 ? void 0 : (_dndContext$active$da2 = _dndContext$active$da.schema) === null || _dndContext$active$da2 === void 0 ? void 0 : _dndContext$active$da2.parent;
+  var blocksLength = activeSchema ? Object.keys(activeSchema.properties).length : 0;
+  var visible = true;
+
+  if (blocksLength === 1) {
+    if (props.first) {
+      visible = activeSchema !== props.cols[0];
+    } else {
+      var currentSchema = props.cols[props.index];
+      var downSchema = props.cols[props.index + 1];
+      visible = activeSchema !== currentSchema && downSchema !== activeSchema;
+    }
+  }
+
   return /*#__PURE__*/_react2.default.createElement("div", {
-    ref: setNodeRef,
+    ref: visible ? setNodeRef : null,
     className: (0, _classnames.default)('nb-col-divider', (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          width: 24px;\n        "])))),
     style: _objectSpread({}, droppableStyle)
   });
 };
 
 var RowDivider = function RowDivider(props) {
+  var _dndContext$active2, _dndContext$active2$d, _dndContext$active2$d2;
+
   var _useDroppable2 = (0, _core.useDroppable)({
     id: props.id,
     data: props.data
@@ -92,6 +119,23 @@ var RowDivider = function RowDivider(props) {
       active = _useState2[0],
       setActive = _useState2[1];
 
+  var dndContext = (0, _core.useDndContext)();
+  var currentSchema = props.rows[props.index];
+  var activeSchema = (_dndContext$active2 = dndContext.active) === null || _dndContext$active2 === void 0 ? void 0 : (_dndContext$active2$d = _dndContext$active2.data.current) === null || _dndContext$active2$d === void 0 ? void 0 : (_dndContext$active2$d2 = _dndContext$active2$d.schema) === null || _dndContext$active2$d2 === void 0 ? void 0 : _dndContext$active2$d2.parent.parent;
+  var colsLength = activeSchema === null || activeSchema === void 0 ? void 0 : activeSchema.mapProperties(function (schema) {
+    return schema['x-component'] === 'Grid.Col';
+  }).filter(Boolean).length;
+  var visible = true; // col > 1 时不需要隐藏
+
+  if (colsLength === 1) {
+    if (props.first) {
+      visible = activeSchema !== props.rows[0];
+    } else {
+      var downSchema = props.rows[props.index + 1];
+      visible = activeSchema !== currentSchema && downSchema !== activeSchema;
+    }
+  }
+
   (0, _core.useDndMonitor)({
     onDragStart: function onDragStart(event) {
       setActive(true);
@@ -106,7 +150,7 @@ var RowDivider = function RowDivider(props) {
     }
   });
   return /*#__PURE__*/_react2.default.createElement("span", {
-    ref: setNodeRef,
+    ref: visible ? setNodeRef : null,
     className: (0, _classnames.default)('nb-row-divider', (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n          height: 24px;\n          width: 100%;\n          position: absolute;\n          margin-top: -24px;\n        "])))),
     style: _objectSpread({
       zIndex: active ? 1000 : -1
@@ -193,6 +237,7 @@ var useGridRowContext = function useGridRowContext() {
 
 exports.useGridRowContext = useGridRowContext;
 var Grid = (0, _react.observer)(function (props) {
+  var gridRef = (0, _react2.useRef)(null);
   var field = (0, _react.useField)();
   var fieldSchema = (0, _react.useFieldSchema)();
 
@@ -201,8 +246,16 @@ var Grid = (0, _react.observer)(function (props) {
 
   var addr = field.address.toString();
   var rows = useRowProperties();
+
+  var _useFormBlockContext = (0, _.useFormBlockContext)(),
+      setPrintContent = _useFormBlockContext.setPrintContent;
+
+  (0, _react2.useEffect)(function () {
+    gridRef.current && (setPrintContent === null || setPrintContent === void 0 ? void 0 : setPrintContent(gridRef.current));
+  }, [gridRef.current]);
   return /*#__PURE__*/_react2.default.createElement(GridContext.Provider, {
     value: {
+      ref: gridRef,
       fieldSchema: fieldSchema,
       renderSchemaInitializer: render
     }
@@ -210,12 +263,16 @@ var Grid = (0, _react.observer)(function (props) {
     className: 'nb-grid',
     style: {
       position: 'relative'
-    }
+    },
+    ref: gridRef
   }, /*#__PURE__*/_react2.default.createElement(DndWrapper, {
     dndContext: props.dndContext
   }, /*#__PURE__*/_react2.default.createElement(RowDivider, {
+    rows: rows,
+    first: true,
     id: "".concat(addr, "_0"),
     data: {
+      breakRemoveOn: breakRemoveOnGrid,
       wrapSchema: wrapRowSchema,
       insertAdjacent: 'afterBegin',
       schema: fieldSchema
@@ -227,8 +284,11 @@ var Grid = (0, _react.observer)(function (props) {
       name: schema.name,
       schema: schema
     }), /*#__PURE__*/_react2.default.createElement(RowDivider, {
+      rows: rows,
+      index: index,
       id: "".concat(addr, "_").concat(index + 1),
       data: {
+        breakRemoveOn: breakRemoveOnGrid,
         wrapSchema: wrapRowSchema,
         insertAdjacent: 'afterEnd',
         schema: schema
@@ -249,8 +309,11 @@ Grid.Row = (0, _react.observer)(function (props) {
   }, /*#__PURE__*/_react2.default.createElement("div", {
     className: (0, _classnames.default)('nb-grid-row', (0, _css.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n            margin: 0 -24px;\n            display: flex;\n            position: relative;\n            /* z-index: 0; */\n          "]))))
   }, /*#__PURE__*/_react2.default.createElement(ColDivider, {
+    cols: cols,
+    first: true,
     id: "".concat(addr, "_0"),
     data: {
+      breakRemoveOn: breakRemoveOnRow,
       wrapSchema: wrapColSchema,
       insertAdjacent: 'afterBegin',
       schema: fieldSchema
@@ -262,8 +325,11 @@ Grid.Row = (0, _react.observer)(function (props) {
       name: schema.name,
       schema: schema
     }), /*#__PURE__*/_react2.default.createElement(ColDivider, {
+      cols: cols,
+      index: index,
       id: "".concat(addr, "_").concat(index + 1),
       data: {
+        breakRemoveOn: breakRemoveOnRow,
         wrapSchema: wrapColSchema,
         insertAdjacent: 'afterEnd',
         schema: schema

package/lib/schema-component/antd/input-number/InputNumber.d.ts

@@ -1,7 +1,3 @@
 import React from 'react';
-export declare const InputNumber: React.ForwardRefExoticComponent<Pick<Partial<import("antd").InputNumberProps<string | number> & {
-    children?: React.ReactNode;
-} & {
-    ref?: React.Ref<HTMLInputElement>;
-}>, keyof import("antd").InputNumberProps<string | number>> & React.RefAttributes<unknown>>;
+export declare const InputNumber: React.ForwardRefExoticComponent<Pick<Partial<any>, string | number | symbol> & React.RefAttributes<unknown>>;
 export default InputNumber;

package/lib/schema-component/antd/input-number/InputNumber.js

@@ -5,13 +5,40 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.InputNumber = void 0;
 
-var _react = require("@formily/react");
+var _react = _interopRequireDefault(require("react"));
+
+var _react2 = require("@formily/react");
 
 var _antd = require("antd");
 
 var _ReadPretty = require("./ReadPretty");
 
-var InputNumber = (0, _react.connect)(_antd.InputNumber, (0, _react.mapReadPretty)(_ReadPretty.ReadPretty));
+var _excluded = ["onChange"];
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+var InputNumber = (0, _react2.connect)(function (props) {
+  var onChange = props.onChange,
+      others = _objectWithoutProperties(props, _excluded);
+
+  var handleChange = function handleChange(v) {
+    onChange(parseFloat(v));
+  };
+
+  return /*#__PURE__*/_react.default.createElement(_antd.InputNumber, _objectSpread({
+    onChange: handleChange
+  }, others));
+}, (0, _react2.mapReadPretty)(_ReadPretty.ReadPretty));
 exports.InputNumber = InputNumber;
 var _default = InputNumber;
 exports.default = _default;

package/lib/schema-component/antd/kanban/Kanban.Card.Designer.js

@@ -77,6 +77,25 @@ var KanbanCardDesigner = function KanbanCardDesigner(props) {
     readPretty: true,
     block: 'Kanban'
   });
+  var associationFields = (0, _utils.useAssociatedFormItemInitializerFields)({
+    readPretty: true,
+    block: 'Kanban'
+  });
+  var items = [{
+    type: 'itemGroup',
+    title: t('Display fields'),
+    children: fields
+  }];
+
+  if (associationFields.length > 0) {
+    items.push({
+      type: 'divider'
+    }, {
+      type: 'itemGroup',
+      title: t('Display association fields'),
+      children: associationFields
+    });
+  }
 
   if (!designable) {
     return null;
@@ -113,20 +132,7 @@ var KanbanCardDesigner = function KanbanCardDesigner(props) {
       dn.loadAPIClientEvents();
       dn.insertBeforeEnd(schema);
     },
-    items: [{
-      type: 'itemGroup',
-      title: t('Display fields'),
-      children: fields
-    }, {
-      type: 'divider'
-    }, {
-      type: 'itemGroup',
-      title: t('Display association fields'),
-      children: (0, _utils.useAssociatedFormItemInitializerFields)({
-        readPretty: true,
-        block: 'Kanban'
-      })
-    }],
+    items: items,
     component: /*#__PURE__*/_react2.default.createElement(_icons.MenuOutlined, {
       style: {
         cursor: 'pointer',