@nocobase/client 0.7.2-alpha.6 → 0.7.4-alpha.1

package/lib/schema-component/antd/date-picker/util.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.str2moment = exports.moment2str = exports.mapDateFormat = exports.getDefaultFormat = void 0;
+exports.moment2str = exports.mapDateFormat = void 0;
+
+var _client = require("@nocobase/utils/client");
 
 var _moment = _interopRequireDefault(require("moment"));
 
@@ -15,22 +17,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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; }
 
-var toGmt = function toGmt(value) {
-  if (!value) {
-    return value;
-  }
-
-  if (Array.isArray(value)) {
-    return value.map(function (val) {
-      return "".concat(val.format('YYYY-MM-DD'), "T").concat(val.format('HH:mm:ss.SSS'), "Z");
-    });
-  }
-
-  if (_moment.default.isMoment(value)) {
-    return "".concat(value.format('YYYY-MM-DD'), "T").concat(value.format('HH:mm:ss.SSS'), "Z");
-  }
-};
-
 var toStringByPicker = function toStringByPicker(value, picker) {
   if (picker === 'year') {
     return value.format('YYYY') + '-01-01T00:00:00.000Z';
@@ -67,47 +53,6 @@ var toGmtByPicker = function toGmtByPicker(value, picker) {
   }
 };
 
-var toLocal = function toLocal(value) {
-  if (!value) {
-    return value;
-  }
-
-  if (Array.isArray(value)) {
-    return value.map(function (val) {
-      return val.toISOString();
-    });
-  }
-
-  if (_moment.default.isMoment(value)) {
-    return value.toISOString();
-  }
-};
-
-var toMoment = function toMoment(val, options) {
-  if (_moment.default.isMoment(val)) {
-    return val;
-  }
-
-  var gmt = options.gmt,
-      picker = options.picker;
-
-  if (gmt || picker) {
-    val = val.replace('T', ' ').replace('Z', '');
-    return (0, _moment.default)(val);
-  }
-
-  return (0, _moment.default)(val);
-};
-
-var str2moment = function str2moment(value) {
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return Array.isArray(value) ? value.map(function (val) {
-    return toMoment(val, options);
-  }) : value ? toMoment(value, options) : value;
-};
-
-exports.str2moment = str2moment;
-
 var moment2str = function moment2str(value) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var showTime = options.showTime,
@@ -119,7 +64,7 @@ var moment2str = function moment2str(value) {
   }
 
   if (showTime) {
-    return gmt ? toGmt(value) : toLocal(value);
+    return gmt ? (0, _client.toGmt)(value) : (0, _client.toLocal)(value);
   }
 
   return toGmtByPicker(value, picker);
@@ -127,41 +72,13 @@ var moment2str = function moment2str(value) {
 
 exports.moment2str = moment2str;
 
-var getDefaultFormat = function getDefaultFormat(props) {
-  if (props.format) {
-    return props.format;
-  }
-
-  if (props.dateFormat) {
-    if (props['showTime']) {
-      return "".concat(props.dateFormat, " ").concat(props.timeFormat || 'HH:mm:ss');
-    }
-
-    return props.dateFormat;
-  }
-
-  if (props['picker'] === 'month') {
-    return 'YYYY-MM';
-  } else if (props['picker'] === 'quarter') {
-    return 'YYYY-\\QQ';
-  } else if (props['picker'] === 'year') {
-    return 'YYYY';
-  } else if (props['picker'] === 'week') {
-    return 'YYYY-wo';
-  }
-
-  return props['showTime'] ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD';
-};
-
-exports.getDefaultFormat = getDefaultFormat;
-
 var mapDateFormat = function mapDateFormat() {
   return function (props) {
-    var format = getDefaultFormat(props);
+    var format = (0, _client.getDefaultFormat)(props);
     var _onChange = props.onChange;
     return _objectSpread(_objectSpread({}, props), {}, {
       format: format,
-      value: str2moment(props.value, props),
+      value: (0, _client.str2moment)(props.value, props),
       onChange: function onChange(value) {
         if (_onChange) {
           _onChange(moment2str(value, props));

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

@@ -13,11 +13,13 @@ var _react = require("@formily/react");
 
 var _shared = require("@formily/shared");
 
+var _lodash = _interopRequireDefault(require("lodash"));
+
 var _react2 = _interopRequireDefault(require("react"));
 
 var _reactI18next = require("react-i18next");
 
-var _ = require("../..");
+var _2 = require("../..");
 
 var _blockProvider = require("../../../block-provider");
 
@@ -33,6 +35,12 @@ var _templateObject;
 
 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 +75,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 +97,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');
@@ -221,7 +230,7 @@ FormItem.Designer = function (props) {
   }), !field.readPretty && fieldSchema['x-component'] !== 'FormField' && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
     key: "required",
     title: t('Required'),
-    checked: field.required,
+    checked: fieldSchema.required,
     onChange: function onChange(required) {
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
 
@@ -233,6 +242,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(_lodash.default.pickBy(_rule, _lodash.default.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 = _lodash.default.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 +433,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: [{
@@ -341,15 +495,13 @@ FormItem.Designer = function (props) {
     options: options,
     value: field === null || field === void 0 ? void 0 : (_field$componentProps = field.componentProps) === null || _field$componentProps === void 0 ? void 0 : (_field$componentProps2 = _field$componentProps.fieldNames) === null || _field$componentProps2 === void 0 ? void 0 : _field$componentProps2.label,
     onChange: function onChange(label) {
+      var _collectionField$uiSc4, _collectionField$uiSc5;
+
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
 
-      var fieldNames = _objectSpread(_objectSpread({}, field.componentProps.fieldNames), {}, {
+      var fieldNames = _objectSpread(_objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc4 = collectionField.uiSchema) === null || _collectionField$uiSc4 === void 0 ? void 0 : (_collectionField$uiSc5 = _collectionField$uiSc4['x-component-props']) === null || _collectionField$uiSc5 === void 0 ? void 0 : _collectionField$uiSc5['fieldNames']), field.componentProps.fieldNames), {}, {
         label: label
-      }); // if (fieldSchema['x-component-props']?.['field']?.['uiSchema']?.['x-component-props']) {
-      //   fieldSchema['x-component-props']['field']['uiSchema']['x-component-props']['fieldNames'] = fieldNames;
-      // } else {
-      // }
-
+      });
 
       fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
       fieldSchema['x-component-props']['fieldNames'] = fieldNames;

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

@@ -9,9 +9,36 @@ var _react = require("@formily/react");
 
 var _antd = require("antd");
 
+var _react2 = _interopRequireDefault(require("react"));
+
 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, _react.connect)(function (props) {
+  var onChange = props.onChange,
+      others = _objectWithoutProperties(props, _excluded);
+
+  var handleChange = function handleChange(v) {
+    onChange(parseFloat(v));
+  };
+
+  return /*#__PURE__*/_react2.default.createElement(_antd.InputNumber, _objectSpread({
+    onChange: handleChange
+  }, others));
+}, (0, _react.mapReadPretty)(_ReadPretty.ReadPretty));
 exports.InputNumber = InputNumber;
 var _default = InputNumber;
 exports.default = _default;

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

@@ -7,9 +7,7 @@ exports.ReadPretty = void 0;
 
 var _shared = require("@formily/shared");
 
-var _MiniDecimal = require("rc-input-number/lib/utils/MiniDecimal");
-
-var _numberUtil = require("rc-input-number/lib/utils/numberUtil");
+var _client = require("@nocobase/utils/client");
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -25,10 +23,9 @@ var ReadPretty = function ReadPretty(props) {
     return /*#__PURE__*/_react.default.createElement("div", null);
   }
 
-  var precision = Math.max((0, _numberUtil.getNumberPrecision)(String(value)), (0, _numberUtil.getNumberPrecision)(step));
   return /*#__PURE__*/_react.default.createElement("div", {
     className: 'nb-read-pretty-input-number'
-  }, addonBefore, (0, _MiniDecimal.toFixed)(String(value), '.', precision), addonAfter);
+  }, addonBefore, (0, _client.toFixedByStep)(value, step), addonAfter);
 };
 
 exports.ReadPretty = ReadPretty;

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',