@nocobase/client 0.10.0-alpha.2 → 0.10.0-alpha.4

package/lib/schema-component/antd/cascader/Cascader.js

@@ -83,7 +83,7 @@ var Cascader = (0, _react.connect)(function (props) {
     }));
   };
   var handelDropDownVisible = function handelDropDownVisible(value) {
-    if (value && !field.dataSource) {
+    if (value && !field.dataSource.length) {
       run();
     }
   };

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

@@ -95,6 +95,7 @@ FormItem.Designer = function Designer() {
     getField = _useCollection.getField;
   var _useFormBlockContext = (0, _FormBlockProvider.useFormBlockContext)(),
     form = _useFormBlockContext.form;
+  var ctx = (0, _BlockProvider.useBlockRequestContext)();
   var field = (0, _react.useField)();
   var fieldSchema = (0, _react.useFieldSchema)();
   var _useTranslation = (0, _reactI18next.useTranslation)(),
@@ -411,12 +412,15 @@ FormItem.Designer = function Designer() {
       properties: {
         filter: {
           default: defaultFilter,
-          // title: '数据范围',
           enum: dataSource,
           'x-component': 'Filter',
           'x-component-props': {
             dynamicComponent: function dynamicComponent(props) {
-              return (0, _FilterDynamicComponent.FilterDynamicComponent)(_objectSpread({}, props));
+              return (0, _FilterDynamicComponent.FilterDynamicComponent)(_objectSpread(_objectSpread({}, props), {}, {
+                form: form,
+                collectionField: collectionField,
+                rootCollection: ctx.props.collection || ctx.props.resource
+              }));
             }
           }
         }
@@ -428,7 +432,6 @@ FormItem.Designer = function Designer() {
       filter = (0, _filter.removeNullCondition)(filter);
       _lodash.default.set(field.componentProps, 'service.params.filter', filter);
       fieldSchema['x-component-props'] = field.componentProps;
-      field.componentProps = field.componentProps;
       dn.emit('patch', {
         schema: (_schema5 = {}, _defineProperty(_schema5, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema5, 'x-component-props', field.componentProps), _schema5)
       });
@@ -790,6 +793,10 @@ FormItem.Designer = function Designer() {
 function isFileCollection(collection) {
   return (collection === null || collection === void 0 ? void 0 : collection.template) === 'file';
 }
+function extractFirstPart(path) {
+  var firstDotIndex = path.indexOf('.');
+  return firstDotIndex !== -1 ? path.slice(0, firstDotIndex) : path;
+}
 FormItem.FilterFormDesigner = _FormItem.FilterFormDesigner;
 function getFieldDefaultValue(fieldSchema, collectionField) {
   var _fieldSchema$default, _collectionField$uiSc5;

package/lib/schema-component/antd/form-v2/Form.js

@@ -171,7 +171,7 @@ var WithForm = function WithForm(props) {
       form.removeEffects(id);
     };
   }, [linkageRules]);
-  return fieldSchema['x-decorator'] === 'Form' ? /*#__PURE__*/_react2.default.createElement(FormDecorator, _objectSpread({}, props)) : /*#__PURE__*/_react2.default.createElement(FormComponent, _objectSpread({}, props));
+  return fieldSchema['x-decorator'] === 'FormV2' ? /*#__PURE__*/_react2.default.createElement(FormDecorator, _objectSpread({}, props)) : /*#__PURE__*/_react2.default.createElement(FormComponent, _objectSpread({}, props));
 };
 var WithoutForm = function WithoutForm(props) {
   var fieldSchema = (0, _react.useFieldSchema)();
@@ -187,7 +187,7 @@ var WithoutForm = function WithoutForm(props) {
       }
     });
   }, []);
-  return fieldSchema['x-decorator'] === 'Form' ? /*#__PURE__*/_react2.default.createElement(FormDecorator, _objectSpread({
+  return fieldSchema['x-decorator'] === 'FormV2' ? /*#__PURE__*/_react2.default.createElement(FormDecorator, _objectSpread({
     form: form
   }, props)) : /*#__PURE__*/_react2.default.createElement(FormComponent, _objectSpread({
     form: form

package/lib/schema-component/antd/gantt/components/gantt/gantt.js

@@ -247,7 +247,6 @@ var Gantt = function Gantt(props) {
   (0, _react2.useEffect)(function () {
     tableCtx.field.onExpandClick = handleTableExpanderClick;
     tableCtx.field.onRowSelect = handleRowSelect;
-    tableCtx.setExpandFlag(true);
   }, []);
   (0, _react2.useEffect)(function () {
     expandAndCollapseAll === null || expandAndCollapseAll === void 0 ? void 0 : expandAndCollapseAll(!expandFlag);

package/lib/schema-component/antd/gantt/components/grid/grid-body.js

@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.GridBody = void 0;
-var _react = _interopRequireDefault(require("react"));
 var _css = require("@emotion/css");
+var _client = require("@nocobase/utils/client");
+var _react = _interopRequireDefault(require("react"));
 var _dateHelper = require("../../helpers/date-helper");
 var _style = require("./style");
-var _client = require("@nocobase/utils/client");
 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); }

package/lib/schema-component/antd/gantt/components/task-item/bar/bar-small.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.BarSmall = void 0;
-var _react = _interopRequireDefault(require("react"));
 var _css = require("@emotion/css");
+var _react = _interopRequireDefault(require("react"));
 var _barHelper = require("../../../helpers/bar-helper");
 var _barDisplay = require("./bar-display");
 var _barProgressHandle = require("./bar-progress-handle");

package/lib/schema-component/antd/gantt/components/task-item/task-item.js

@@ -109,6 +109,6 @@ var TaskItem = function TaskItem(props) {
     y: isProjectBar ? task.y - 8 : isTextInside ? task.y + taskHeight * 0.5 : task.y + taskHeight * 0.65,
     className: isProjectBar ? (0, _css.cx)(_style.projectLabel) : isTextInside ? (0, _css.cx)(_style.barLabel) : (0, _css.cx)(_style.barLabel) && (0, _css.cx)(_style.barLabelOutside),
     ref: textRef
-  }, isProjectBar ? "".concat(task.name, ": ").concat((0, _otherHelper.getYmd)(task.start), " ~ ").concat((0, _otherHelper.getYmd)(task.end)) : task.name));
+  }, isProjectBar && (0, _otherHelper.getYmd)(task.start) && (0, _otherHelper.getYmd)(task.end) ? "".concat(task.name, ":  ").concat((0, _otherHelper.getYmd)(task.start), " ~ ").concat((0, _otherHelper.getYmd)(task.end)) : task.name));
 };
 exports.TaskItem = TaskItem;

package/lib/schema-component/antd/gantt/helpers/bar-helper.d.ts

@@ -1,6 +1,6 @@
-import { Task } from '../types/public-types';
 import { BarTask } from '../types/bar-task';
 import { BarMoveAction } from '../types/gantt-task-actions';
+import { Task } from '../types/public-types';
 export declare const convertToBarTasks: (tasks: Task[], dates: Date[], columnWidth: number, rowHeight: number, taskHeight: number, barCornerRadius: number, handleWidth: number, rtl: boolean, barProgressColor: string, barProgressSelectedColor: string, barBackgroundColor: string, barBackgroundSelectedColor: string, projectProgressColor: string, projectProgressSelectedColor: string, projectBackgroundColor: string, projectBackgroundSelectedColor: string, milestoneBackgroundColor: string, milestoneBackgroundSelectedColor: string) => BarTask[];
 export declare const progressWithByParams: (taskX1: number, taskX2: number, progress: number, rtl: boolean) => number[];
 export declare const progressByProgressWidth: (progressWidth: number, barTask: BarTask) => number;

package/lib/schema-component/antd/gantt/helpers/bar-helper.js

@@ -65,7 +65,7 @@ var convertToBar = function convertToBar(task, index, dates, columnWidth, rowHei
   var typeInternal = task.type;
   if (typeInternal === 'task' && x2 - x1 < handleWidth * 2) {
     typeInternal = 'smalltask';
-    x2 = x1 + handleWidth * 2;
+    x2 = x1 > 0 ? x1 + handleWidth * 2 : x1;
   }
   var _progressWithByParams = progressWithByParams(x1, x2, task.progress, rtl),
     _progressWithByParams2 = _slicedToArray(_progressWithByParams, 2),
@@ -133,16 +133,16 @@ var taskXCoordinate = function taskXCoordinate(xDate, dates, columnWidth) {
   var remainderMillis = (xDate === null || xDate === void 0 ? void 0 : xDate.getTime()) - ((_dates$index = dates[index]) === null || _dates$index === void 0 ? void 0 : _dates$index.getTime());
   var percentOfInterval = remainderMillis / (((_dates = dates[index + 1]) === null || _dates === void 0 ? void 0 : _dates.getTime()) - ((_dates$index2 = dates[index]) === null || _dates$index2 === void 0 ? void 0 : _dates$index2.getTime()));
   var x = index * columnWidth + percentOfInterval * columnWidth;
-  return x;
+  return isNaN(x) ? 0 : x;
 };
 var taskXCoordinateRTL = function taskXCoordinateRTL(xDate, dates, columnWidth) {
   var x = taskXCoordinate(xDate, dates, columnWidth);
   x += columnWidth;
-  return x;
+  return isNaN(x) ? 0 : x;
 };
 var taskYCoordinate = function taskYCoordinate(index, rowHeight, taskHeight) {
   var y = index * rowHeight + (rowHeight - taskHeight) / 2;
-  return y;
+  return isNaN(y) ? 0 : y;
 };
 var progressWithByParams = function progressWithByParams(taskX1, taskX2, progress, rtl) {
   var progressWidth = (taskX2 - taskX1) * progress * 0.01;

package/lib/schema-component/antd/gantt/helpers/other-helper.js

@@ -73,6 +73,8 @@ var sortTasks = function sortTasks(taskA, taskB) {
 };
 exports.sortTasks = sortTasks;
 var getYmd = function getYmd(date) {
-  return date.getFullYear() + '/' + "".concat(date.getMonth() + 1) + '/' + date.getDate();
+  if (!isNaN(date.getTime())) {
+    return date.getFullYear() + '/' + "".concat(date.getMonth() + 1) + '/' + date.getDate();
+  }
 };
 exports.getYmd = getYmd;

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

@@ -353,7 +353,7 @@ Grid.Row = (0, _react.observer)(function () {
       cols: cols
     }
   }, /*#__PURE__*/_react2.default.createElement("div", {
-    className: (0, _classnames.default)('nb-grid-row', (0, _css.css)(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n              overflow-x: hidden;\n              display: flex;\n              position: relative;\n              /* z-index: 0; */\n            "])))),
+    className: (0, _classnames.default)('nb-grid-row', (0, _css.css)(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n              display: flex;\n              position: relative;\n              /* z-index: 0; */\n            "])))),
     style: {
       margin: showDivider ? '0 calc(-1 * var(--nb-spacing))' : null
     }

package/lib/schema-component/antd/grid-card/GridCard.Designer.js

@@ -4,30 +4,29 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.GridCardDesigner = void 0;
-var _react = require("@formily/react");
-var _react2 = _interopRequireWildcard(require("react"));
 var _antd = require("@formily/antd");
+var _react = require("@formily/react");
 var _antd2 = require("antd");
 var _lodash = _interopRequireDefault(require("lodash"));
+var _react2 = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
 var _collectionManager = require("../../../collection-manager");
 var _schemaSettings = require("../../../schema-settings");
 var _schemaTemplates = require("../../../schema-templates");
+var _core = require("../../core");
 var _hooks = require("../../hooks");
 var _filter = require("../filter");
 var _FilterDynamicComponent = require("../table-v2/FilterDynamicComponent");
-var _core = require("../../core");
 var _options = require("./options");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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 _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); }
 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) { 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); }
-_antd2.Slider;
 var columnCountMarks = [1, 2, 3, 4, 6, 8, 12, 24].reduce(function (obj, cur) {
   obj[cur] = cur;
   return obj;

package/lib/schema-component/antd/grid-card/GridCard.Item.js

@@ -4,22 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.GridCardItem = void 0;
-var _react = _interopRequireDefault(require("react"));
-var _antd = require("antd");
 var _css = require("@emotion/css");
-var _react2 = require("@formily/react");
+var _react = require("@formily/react");
+var _antd = require("antd");
+var _react2 = _interopRequireDefault(require("react"));
 var _recordProvider = require("../../../record-provider");
 var _templateObject, _templateObject2;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 var itemCss = (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  width: 100%;\n  height: 100%;\n  flex-direction: column;\n  justify-content: space-between;\n  gap: 8px;\n"])));
 var GridCardItem = function GridCardItem(props) {
-  var field = (0, _react2.useField)();
-  return /*#__PURE__*/_react.default.createElement(_antd.Card, {
-    className: (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n        &,\n        & .ant-card-body {\n          height: 100%;\n        }\n      "])))
-  }, /*#__PURE__*/_react.default.createElement("div", {
+  var field = (0, _react.useField)();
+  return /*#__PURE__*/_react2.default.createElement(_antd.Card, {
+    className: (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n        height: 100%;\n        > .ant-card-body {\n          padding: 24px 24px 0px;\n          height: 100%;\n        }\n        .nb-action-bar button {\n          margin-bottom: 10px;\n        }\n      "])))
+  }, /*#__PURE__*/_react2.default.createElement("div", {
     className: itemCss
-  }, /*#__PURE__*/_react.default.createElement(_recordProvider.RecordSimpleProvider, {
+  }, /*#__PURE__*/_react2.default.createElement(_recordProvider.RecordSimpleProvider, {
     value: field.value
   }, props.children)));
 };

package/lib/schema-component/antd/index.less

@@ -42,7 +42,5 @@
 }
 
 html body {
-  --adm-font-family: -apple-system, BlinkMacSystemFont, Segoe UI, PingFang SC, Hiragino Sans GB,
-  Microsoft YaHei, Helvetica Neue, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji,
-  Segoe UI Symbol;
+  --adm-font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";
 }

package/lib/schema-component/antd/list/List.Decorator.js

@@ -5,11 +5,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useListItemProps = exports.useListBlockContext = exports.ListBlockProvider = exports.ListBlockContext = void 0;
+var _css = require("@emotion/css");
+var _antd = require("@formily/antd");
 var _core = require("@formily/core");
 var _react = require("@formily/react");
-var _css = require("@emotion/css");
 var _react2 = _interopRequireWildcard(require("react"));
-var _antd = require("@formily/antd");
 var _blockProvider = require("../../../block-provider");
 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); }
@@ -49,7 +49,7 @@ var InternalListBlockProvider = function InternalListBlockProvider(props) {
   }, /*#__PURE__*/_react2.default.createElement(_antd.FormLayout, {
     layout: 'vertical'
   }, /*#__PURE__*/_react2.default.createElement("div", {
-    className: (0, _css.cx)((0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n                .ant-description-input {\n                  line-height: 34px;\n                }\n                .ant-formily-item-feedback-layout-loose {\n                  margin-bottom: 12px;\n                }\n              "]))))
+    className: (0, _css.cx)((0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n                .ant-description-input {\n                  line-height: 34px;\n                }\n                .ant-formily-item-feedback-layout-loose {\n                  display: inline;\n                }\n              "]))))
   }, props.children))));
 };
 var ListBlockProvider = function ListBlockProvider(props) {

package/lib/schema-component/antd/list/List.Item.js

@@ -4,19 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ListItem = void 0;
-var _react = _interopRequireDefault(require("react"));
 var _css = require("@emotion/css");
-var _react2 = require("@formily/react");
+var _react = require("@formily/react");
+var _react2 = _interopRequireDefault(require("react"));
 var _recordProvider = require("../../../record-provider");
 var _templateObject;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-var itemCss = (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  width: 100%;\n  flex-direction: column;\n  // gap: 8px;\n  padding: 5px 0;\n  border-bottom: 1px solid #f0f0f0;\n"])));
+var itemCss = (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  width: 100%;\n  flex-direction: column;\n  // gap: 8px;\n  padding: 4px 5px 0;\n  border-bottom: 1px solid #f0f0f0;\n"])));
 var ListItem = function ListItem(props) {
-  var field = (0, _react2.useField)();
-  return /*#__PURE__*/_react.default.createElement("div", {
+  var field = (0, _react.useField)();
+  return /*#__PURE__*/_react2.default.createElement("div", {
     className: itemCss
-  }, /*#__PURE__*/_react.default.createElement(_recordProvider.RecordSimpleProvider, {
+  }, /*#__PURE__*/_react2.default.createElement(_recordProvider.RecordSimpleProvider, {
     value: field.value
   }, props.children));
 };

package/lib/schema-component/antd/list/List.d.ts

@@ -1,6 +1,6 @@
-import { ListDesigner } from './List.Designer';
-import { ListBlockProvider } from './List.Decorator';
 import React from 'react';
+import { ListBlockProvider } from './List.Decorator';
+import { ListDesigner } from './List.Designer';
 import { ListItem } from './List.Item';
 export declare const List: ((props: any) => React.JSX.Element) & {
     Item: typeof ListItem;

package/lib/schema-component/antd/list/List.js

@@ -5,16 +5,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.List = void 0;
-var _List = require("./List.Designer");
-var _List2 = require("./List.Decorator");
-var _react = _interopRequireWildcard(require("react"));
-var _react2 = require("@formily/react");
 var _css = require("@emotion/css");
+var _react = require("@formily/react");
 var _antd = require("antd");
-var _hooks = require("./hooks");
+var _react2 = _interopRequireWildcard(require("react"));
 var _common = require("../../common");
 var _core = require("../../core");
-var _hooks2 = require("../../hooks");
+var _hooks = require("../../hooks");
+var _hooks2 = require("./hooks");
+var _List = require("./List.Decorator");
+var _List2 = require("./List.Designer");
 var _List3 = require("./List.Item");
 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); }
@@ -31,43 +31,43 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-var designerCss = (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  width: 100%;\n  margin-bottom: var(--nb-spacing);\n  &:hover {\n    > .general-schema-designer {\n      display: block;\n    }\n  }\n\n  > .general-schema-designer {\n    position: absolute;\n    z-index: 999;\n    top: 0;\n    bottom: 0;\n    left: 0;\n    right: 0;\n    display: none;\n    background: rgba(241, 139, 98, 0.06);\n    border: 0;\n    pointer-events: none;\n    > .general-schema-designer-icons {\n      position: absolute;\n      right: 2px;\n      top: 2px;\n      line-height: 16px;\n      pointer-events: all;\n      .ant-space-item {\n        background-color: #f18b62;\n        color: #fff;\n        line-height: 16px;\n        width: 16px;\n        padding-left: 1px;\n      }\n    }\n  }\n"])));
+var designerCss = (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  width: 100%;\n  margin-bottom: var(--nb-spacing);\n  .nb-action-bar {\n    margin-top: 10px;\n  }\n  &:hover {\n    > .general-schema-designer {\n      display: block;\n    }\n  }\n\n  > .general-schema-designer {\n    position: absolute;\n    z-index: 999;\n    top: 0;\n    bottom: 0;\n    left: 0;\n    right: 0;\n    display: none;\n    background: rgba(241, 139, 98, 0.06);\n    border: 0;\n    pointer-events: none;\n    > .general-schema-designer-icons {\n      position: absolute;\n      right: 2px;\n      top: 2px;\n      line-height: 16px;\n      pointer-events: all;\n      .ant-space-item {\n        background-color: #f18b62;\n        color: #fff;\n        line-height: 16px;\n        width: 16px;\n        padding-left: 1px;\n      }\n    }\n  }\n"])));
 var InternalList = function InternalList(props) {
   var _service$data, _field$value;
-  var _useListBlockContext = (0, _List2.useListBlockContext)(),
+  var _useListBlockContext = (0, _List.useListBlockContext)(),
     service = _useListBlockContext.service;
   var run = service.run,
     params = service.params;
-  var fieldSchema = (0, _react2.useFieldSchema)();
-  var Designer = (0, _hooks2.useDesigner)();
+  var fieldSchema = (0, _react.useFieldSchema)();
+  var Designer = (0, _hooks.useDesigner)();
   var meta = service === null || service === void 0 ? void 0 : (_service$data = service.data) === null || _service$data === void 0 ? void 0 : _service$data.meta;
-  var field = (0, _react2.useField)();
-  var _useState = (0, _react.useState)(new Map()),
+  var field = (0, _react.useField)();
+  var _useState = (0, _react2.useState)(new Map()),
     _useState2 = _slicedToArray(_useState, 1),
     schemaMap = _useState2[0];
-  var getSchema = (0, _react.useCallback)(function (key) {
+  var getSchema = (0, _react2.useCallback)(function (key) {
     if (!schemaMap.has(key)) {
-      schemaMap.set(key, new _react2.Schema({
+      schemaMap.set(key, new _react.Schema({
         type: 'object',
         properties: _defineProperty({}, key, fieldSchema.properties['item'])
       }));
     }
     return schemaMap.get(key);
   }, [fieldSchema.properties, schemaMap]);
-  var onPaginationChange = (0, _react.useCallback)(function (page, pageSize) {
+  var onPaginationChange = (0, _react2.useCallback)(function (page, pageSize) {
     run(_objectSpread(_objectSpread({}, params === null || params === void 0 ? void 0 : params[0]), {}, {
       page: page,
       pageSize: pageSize
     }));
   }, [run, params]);
-  return /*#__PURE__*/_react.default.createElement(_core.SchemaComponentOptions, {
+  return /*#__PURE__*/_react2.default.createElement(_core.SchemaComponentOptions, {
     scope: {
-      useListItemProps: _List2.useListItemProps,
-      useListActionBarProps: _hooks.useListActionBarProps
+      useListItemProps: _List.useListItemProps,
+      useListActionBarProps: _hooks2.useListActionBarProps
     }
-  }, /*#__PURE__*/_react.default.createElement(_common.SortableItem, {
+  }, /*#__PURE__*/_react2.default.createElement(_common.SortableItem, {
     className: (0, _css.cx)('nb-list', designerCss)
-  }, /*#__PURE__*/_react.default.createElement(_antd.List, {
+  }, /*#__PURE__*/_react2.default.createElement(_antd.List, {
     pagination: !meta || meta.count <= meta.pageSize ? false : {
       onChange: onPaginationChange,
       total: (meta === null || meta === void 0 ? void 0 : meta.count) || 0,
@@ -76,17 +76,17 @@ var InternalList = function InternalList(props) {
     },
     loading: service === null || service === void 0 ? void 0 : service.loading
   }, (_field$value = field.value) === null || _field$value === void 0 ? void 0 : _field$value.map(function (item, index) {
-    return /*#__PURE__*/_react.default.createElement(_react2.RecursionField, {
+    return /*#__PURE__*/_react2.default.createElement(_react.RecursionField, {
       basePath: field.address,
       key: index,
       name: index,
       onlyRenderProperties: true,
       schema: getSchema(index)
     });
-  })), /*#__PURE__*/_react.default.createElement(Designer, null)));
+  })), /*#__PURE__*/_react2.default.createElement(Designer, null)));
 };
 var List = InternalList;
 exports.List = List;
 List.Item = _List3.ListItem;
-List.Designer = _List.ListDesigner;
-List.Decorator = _List2.ListBlockProvider;
+List.Designer = _List2.ListDesigner;
+List.Decorator = _List.ListBlockProvider;