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

package/lib/schema-component/antd/menu/Menu.js

@@ -34,7 +34,7 @@ var _excluded = ["onSelect", "mode", "selectedUid", "defaultSelectedUid", "sideM
     _excluded3 = ["icon"],
     _excluded4 = ["icon"];
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9;
 
 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); }
 
@@ -299,6 +299,7 @@ Menu.Item = (0, _react.observer)(function (props) {
   var field = (0, _react.useField)();
   var Designer = (0, _react2.useContext)(MenuItemDesignerContext);
   return /*#__PURE__*/_react2.default.createElement(_antd.Menu.Item, _objectSpread(_objectSpread({}, others), {}, {
+    className: (0, _css.css)(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n        :active {\n          background: inherit;\n        }\n      "]))),
     key: schema.name,
     eventKey: schema.name,
     schema: schema
@@ -307,7 +308,7 @@ Menu.Item = (0, _react.observer)(function (props) {
   }, /*#__PURE__*/_react2.default.createElement(_2.Icon, {
     type: icon
   }), /*#__PURE__*/_react2.default.createElement("span", {
-    className: (0, _css.css)(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n            overflow: hidden;\n            text-overflow: ellipsis;\n            display: inline-block;\n            width: 100%;\n            vertical-align: middle;\n          "])))
+    className: (0, _css.css)(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n            overflow: hidden;\n            text-overflow: ellipsis;\n            display: inline-block;\n            width: 100%;\n            vertical-align: middle;\n          "])))
   }, field.title), /*#__PURE__*/_react2.default.createElement(Designer, null)));
 });
 Menu.URL = (0, _react.observer)(function (props) {
@@ -318,6 +319,7 @@ Menu.URL = (0, _react.observer)(function (props) {
   var field = (0, _react.useField)();
   var Designer = (0, _react2.useContext)(MenuItemDesignerContext);
   return /*#__PURE__*/_react2.default.createElement(_antd.Menu.Item, _objectSpread(_objectSpread({}, others), {}, {
+    className: (0, _css.css)(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n        :active {\n          background: inherit;\n        }\n      "]))),
     key: schema.name,
     eventKey: schema.name,
     schema: schema,
@@ -329,7 +331,7 @@ Menu.URL = (0, _react.observer)(function (props) {
   }, /*#__PURE__*/_react2.default.createElement(_2.Icon, {
     type: icon
   }), /*#__PURE__*/_react2.default.createElement("span", {
-    className: (0, _css.css)(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n            overflow: hidden;\n            text-overflow: ellipsis;\n            display: inline-block;\n            width: 100%;\n            vertical-align: middle;\n          "])))
+    className: (0, _css.css)(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n            overflow: hidden;\n            text-overflow: ellipsis;\n            display: inline-block;\n            width: 100%;\n            vertical-align: middle;\n          "])))
   }, field.title), /*#__PURE__*/_react2.default.createElement(Designer, null)));
 });
 Menu.SubMenu = (0, _react.observer)(function (props) {
@@ -346,6 +348,7 @@ Menu.SubMenu = (0, _react.observer)(function (props) {
   }
 
   return /*#__PURE__*/_react2.default.createElement(_antd.Menu.SubMenu, _objectSpread(_objectSpread({}, others), {}, {
+    className: (0, _css.css)(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n        :active {\n          background: inherit;\n        }\n      "]))),
     key: schema.name,
     eventKey: schema.name,
     title: /*#__PURE__*/_react2.default.createElement(_.SortableItem, {

package/lib/schema-component/antd/percent/Percent.js

@@ -34,10 +34,10 @@ var Percent = (0, _react.connect)(function (props) {
       _onChange = props.onChange;
   return /*#__PURE__*/_react2.default.createElement(_antd.InputNumber, _objectSpread(_objectSpread({}, props), {}, {
     addonAfter: "%",
-    value: math.round(value * 100, 9),
+    value: value ? math.round(value * 100, 9) : null,
     onChange: function onChange(v) {
       if (_onChange) {
-        _onChange(math.round(v / 100, 9));
+        _onChange(v ? math.round(v / 100, 9) : null);
       }
     }
   }));

package/lib/schema-component/antd/record-picker/InputRecordPicker.js

@@ -25,6 +25,8 @@ var _action = require("../action");
 
 var _useFieldNames = require("./useFieldNames");
 
+var _lodash = require("lodash");
+
 var _excluded = ["onRowSelectionChange", "rowKey"],
     _excluded2 = ["value", "multiple", "onChange"];
 
@@ -57,31 +59,44 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 var RecordPickerContext = /*#__PURE__*/(0, _react2.createContext)(null);
 
 var useTableSelectorProps = function useTableSelectorProps() {
+  var field = (0, _react.useField)();
+
   var _useContext = (0, _react2.useContext)(RecordPickerContext),
       multiple = _useContext.multiple,
       value = _useContext.value,
       setSelectedRows = _useContext.setSelectedRows,
-      selectedRows = _useContext.selectedRows;
+      rcSelectRows = _useContext.selectedRows;
 
   var _useTsp = (0, _TableSelectorProvider.useTableSelectorProps)(),
       _onRowSelectionChange = _useTsp.onRowSelectionChange,
       rowKey = _useTsp.rowKey,
-      others = _objectWithoutProperties(_useTsp, _excluded);
+      others = _objectWithoutProperties(_useTsp, _excluded); // console.log('useTableSelectorProps', field.value, value);
+
 
   return _objectSpread(_objectSpread({}, others), {}, {
     rowKey: rowKey,
     rowSelection: {
       type: multiple ? 'checkbox' : 'radio',
-      defaultSelectedRowKeys: selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.map(function (item) {
-        return item[rowKey || 'id'];
-      }),
-      selectedRowKeys: selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.map(function (item) {
+      // defaultSelectedRowKeys: rcSelectRows?.map((item) => item[rowKey||'id']),
+      selectedRowKeys: rcSelectRows === null || rcSelectRows === void 0 ? void 0 : rcSelectRows.map(function (item) {
         return item[rowKey || 'id'];
       })
     },
     onRowSelectionChange: function onRowSelectionChange(selectedRowKeys, selectedRows) {
-      _onRowSelectionChange === null || _onRowSelectionChange === void 0 ? void 0 : _onRowSelectionChange(selectedRowKeys, selectedRows);
-      setSelectedRows === null || setSelectedRows === void 0 ? void 0 : setSelectedRows(selectedRows);
+      if (multiple) {
+        var scopeRows = field.value || [];
+        var allSelectedRows = rcSelectRows || [];
+        var otherRows = (0, _lodash.differenceBy)(allSelectedRows, scopeRows, rowKey || 'id');
+        var unionSelectedRows = (0, _lodash.unionBy)(otherRows, selectedRows, rowKey || 'id');
+        var unionSelectedRowKeys = unionSelectedRows.map(function (item) {
+          return item[rowKey || 'id'];
+        });
+        setSelectedRows === null || setSelectedRows === void 0 ? void 0 : setSelectedRows(unionSelectedRows);
+        _onRowSelectionChange === null || _onRowSelectionChange === void 0 ? void 0 : _onRowSelectionChange(unionSelectedRowKeys, unionSelectedRows);
+      } else {
+        setSelectedRows === null || setSelectedRows === void 0 ? void 0 : setSelectedRows(selectedRows);
+        _onRowSelectionChange === null || _onRowSelectionChange === void 0 ? void 0 : _onRowSelectionChange(selectedRowKeys, selectedRows);
+      }
     }
   });
 };
@@ -159,13 +174,13 @@ var InputRecordPicker = function InputRecordPicker(props) {
       setSelectedRows(opts);
     }
   }, [value]);
-  (0, _react2.useEffect)(function () {});
 
   var getValue = function getValue() {
-    if (multiple == null) return null;
-    return multiple ? Array.isArray(value) ? value === null || value === void 0 ? void 0 : value.map(function (v) {
+    if (multiple == null) return null; // console.log('getValue', multiple, value, Array.isArray(value));
+
+    return Array.isArray(value) ? value === null || value === void 0 ? void 0 : value.map(function (v) {
       return v[fieldNames.value];
-    }) : [] : value === null || value === void 0 ? void 0 : value[fieldNames.value];
+    }) : value === null || value === void 0 ? void 0 : value[fieldNames.value];
   };
 
   return /*#__PURE__*/_react2.default.createElement("div", null, /*#__PURE__*/_react2.default.createElement(_antd.Select, _objectSpread(_objectSpread({}, others), {}, {

package/lib/schema-component/antd/record-picker/ReadPrettyRecordPicker.js

@@ -81,7 +81,9 @@ var ReadPrettyRecordPicker = (0, _react.observer)(function (props) {
 
   var renderRecords = function renderRecords() {
     return (0, _shared.toArr)(field.value).map(function (record, index, arr) {
-      return /*#__PURE__*/_react2.default.createElement(_react2.default.Fragment, null, /*#__PURE__*/_react2.default.createElement("span", null, /*#__PURE__*/_react2.default.createElement("a", {
+      return /*#__PURE__*/_react2.default.createElement(_react2.Fragment, {
+        key: "".concat(record.id, "_").concat(index)
+      }, /*#__PURE__*/_react2.default.createElement("span", null, /*#__PURE__*/_react2.default.createElement("a", {
         onClick: function onClick(e) {
           var _ellipsisWithTooltipR;
 

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

@@ -94,8 +94,8 @@ var useTableColumns = function useTableColumns() {
       render: function render(v, record) {
         var _field$value;
 
-        var index = (_field$value = field.value) === null || _field$value === void 0 ? void 0 : _field$value.indexOf(record);
-        console.log((Date.now() - start) / 1000);
+        var index = (_field$value = field.value) === null || _field$value === void 0 ? void 0 : _field$value.indexOf(record); // console.log((Date.now() - start) / 1000);
+
         return /*#__PURE__*/_react2.default.createElement(_2.RecordIndexProvider, {
           index: index
         }, /*#__PURE__*/_react2.default.createElement(_2.RecordProvider, {

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

@@ -32,7 +32,7 @@ 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 usePaginationProps = function usePaginationProps(props, service) {
-  var _props$request, _props$request$params;
+  var _props$request, _props$request$params, _service$data;
 
   if (props.pagination === false) {
     return false;
@@ -46,6 +46,16 @@ var usePaginationProps = function usePaginationProps(props, service) {
     pagination.defaultPageSize = props === null || props === void 0 ? void 0 : (_props$request2 = props.request) === null || _props$request2 === void 0 ? void 0 : (_props$request2$param = _props$request2.params) === null || _props$request2$param === void 0 ? void 0 : _props$request2$param.pageSize;
   }
 
+  if (!pagination.total && (service === null || service === void 0 ? void 0 : (_service$data = service.data) === null || _service$data === void 0 ? void 0 : _service$data.meta)) {
+    var _service$data$meta = service.data.meta,
+        count = _service$data$meta.count,
+        page = _service$data$meta.page,
+        pageSize = _service$data$meta.pageSize;
+    pagination.total = count;
+    pagination.current = page;
+    pagination.pageSize = pageSize;
+  }
+
   return _objectSpread(_objectSpread({
     showSizeChanger: true
   }, pagination), {}, {

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

@@ -66,8 +66,7 @@ var useTableColumns = function useTableColumns() {
 
   var _useSchemaInitializer = (0, _2.useSchemaInitializer)(schema['x-initializer']),
       exists = _useSchemaInitializer.exists,
-      render = _useSchemaInitializer.render; // console.log('useTableColumns', exists);
-
+      render = _useSchemaInitializer.render;
 
   var columns = schema.reduceProperties(function (buf, s) {
     if (isColumnComponent(s)) {
@@ -82,7 +81,6 @@ var useTableColumns = function useTableColumns() {
       }
     }, []);
     var dataIndex = (collectionFields === null || collectionFields === void 0 ? void 0 : collectionFields.length) > 0 ? collectionFields[0].name : s.name;
-    console.log('useTableColumns', s.name, s, field.value);
     return {
       title: /*#__PURE__*/_react2.default.createElement(_react.RecursionField, {
         name: s.name,
@@ -98,7 +96,6 @@ var useTableColumns = function useTableColumns() {
 
         var index = (_field$value = field.value) === null || _field$value === void 0 ? void 0 : _field$value.indexOf(record); // console.log((Date.now() - start) / 1000);
 
-        console.log('useTableColumns.index', index, record);
         return /*#__PURE__*/_react2.default.createElement(_2.RecordIndexProvider, {
           index: index
         }, /*#__PURE__*/_react2.default.createElement(_2.RecordProvider, {

package/lib/schema-component/antd/time-picker/ReadPretty.js

@@ -11,17 +11,24 @@ var _shared = require("@formily/shared");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _moment = _interopRequireDefault(require("moment"));
+
 var _react = _interopRequireDefault(require("react"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var ReadPretty = function ReadPretty(props) {
-  var placeholder = props.placeholder;
+  var value = props.value,
+      _props$format = props.format,
+      format = _props$format === void 0 ? 'HH:mm:ss' : _props$format;
   var prefixCls = (0, _builtins__.usePrefixCls)('description-text', props);
+  var values = (0, _shared.toArr)(value);
 
   var getLabels = function getLabels() {
-    var labels = (0, _builtins__.formatMomentValue)(props.value, props.format, placeholder);
-    return (0, _shared.isArr)(labels) ? labels.join('~') : labels;
+    var labels = values.map(function (v) {
+      return (0, _moment.default)(v, 'HH:mm:ss').format(format);
+    });
+    return labels.join('~');
   };
 
   return /*#__PURE__*/_react.default.createElement("div", {

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

@@ -755,6 +755,27 @@ var Designable = /*#__PURE__*/function () {
           wrap = _options$wrap4 === void 0 ? defaultWrap : _options$wrap4,
           breakRemoveOn = options.breakRemoveOn,
           removeParentsIfNoChildren = options.removeParentsIfNoChildren;
+      var order = 0;
+      var newOrder = 0;
+      var start = false;
+      var properties = {};
+      this.current.parent.mapProperties(function (property, key) {
+        property['x-index'] = order;
+
+        if (key === _this4.current.name) {
+          ++order;
+          newOrder = order;
+          start = true;
+        }
+
+        ++order;
+
+        if (start && key !== _this4.current.name) {
+          properties[key] = property;
+
+          _this4.current.parent.removeProperty(key);
+        }
+      });
 
       if (_react.Schema.isSchemaInstance(schema)) {
         if (this.parentsIn(schema)) {
@@ -778,27 +799,6 @@ var Designable = /*#__PURE__*/function () {
         schema = (0, _cloneDeep.default)(schema);
       }
 
-      var order = 0;
-      var newOrder = 0;
-      var start = false;
-      var properties = {};
-      this.current.parent.mapProperties(function (property, key) {
-        property['x-index'] = order;
-
-        if (key === _this4.current.name) {
-          ++order;
-          newOrder = order;
-          start = true;
-        }
-
-        ++order;
-
-        if (start && key !== _this4.current.name) {
-          properties[key] = property;
-
-          _this4.current.parent.removeProperty(key);
-        }
-      });
       this.prepareProperty(schema);
       var wrapped = wrap(schema);
       var s = this.current.parent.addProperty(wrapped.name || (0, _shared.uid)(), wrapped);

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

@@ -17,7 +17,7 @@ var useProps = function useProps(props, options) {
   var useProps = props.useProps,
       props1 = _objectWithoutProperties(props, _excluded);
 
-  var props2 = (useProps === null || useProps === void 0 ? void 0 : useProps()) || {};
+  var props2 = typeof useProps === 'function' ? useProps() : {};
   return (0, _shared.merge)(props1 || {}, props2, options);
 };
 

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FormItemInitializers = void 0;
 
+var _lodash = require("lodash");
+
 var _react = _interopRequireDefault(require("react"));
 
 var _reactI18next = require("react-i18next");
@@ -22,14 +24,24 @@ var FormItemInitializers = function FormItemInitializers(props) {
 
   var insertPosition = props.insertPosition,
       component = props.component;
+  var associationFields = (0, _utils.useAssociatedFormItemInitializerFields)({
+    readPretty: true,
+    block: 'Form'
+  });
   return /*#__PURE__*/_react.default.createElement(_SchemaInitializer.SchemaInitializer.Button, {
     wrap: _utils.gridRowColWrap,
     icon: 'SettingOutlined',
-    items: [{
+    items: (0, _lodash.union)([{
       type: 'itemGroup',
       title: t('Display fields'),
       children: (0, _utils.useFormItemInitializerFields)()
+    }], associationFields.length > 0 ? [{
+      type: 'divider'
     }, {
+      type: 'itemGroup',
+      title: t('Display association fields'),
+      children: associationFields
+    }] : [], [{
       type: 'divider'
     }, {
       type: 'item',
@@ -45,7 +57,7 @@ var FormItemInitializers = function FormItemInitializers(props) {
           content: t('This is a demo text, **supports Markdown syntax**.')
         }
       }
-    }],
+    }]),
     insertPosition: insertPosition,
     component: component,
     title: component ? null : t('Configure fields')

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

@@ -33,6 +33,14 @@ var ReadPrettyFormActionInitializers = {
         'x-component': 'Action',
         'x-decorator': 'ACLActionProvider'
       }
+    }, {
+      type: 'item',
+      title: '{{t("Print")}}',
+      component: 'PrintActionInitializer',
+      schema: {
+        'x-component': 'Action',
+        'x-decorator': 'ACLActionProvider'
+      }
     }]
   }, {
     type: 'divider'

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ReadPrettyFormItemInitializers = void 0;
 
+var _lodash = require("lodash");
+
 var _react = _interopRequireDefault(require("react"));
 
 var _reactI18next = require("react-i18next");
@@ -21,14 +23,24 @@ var ReadPrettyFormItemInitializers = function ReadPrettyFormItemInitializers(pro
 
   var insertPosition = props.insertPosition,
       component = props.component;
+  var associationFields = (0, _utils.useAssociatedFormItemInitializerFields)({
+    readPretty: true,
+    block: 'Form'
+  });
   return /*#__PURE__*/_react.default.createElement(_SchemaInitializer.SchemaInitializer.Button, {
     wrap: _utils.gridRowColWrap,
     icon: 'SettingOutlined',
-    items: [{
+    items: (0, _lodash.union)([{
       type: 'itemGroup',
       title: t('Display fields'),
       children: (0, _utils.useFormItemInitializerFields)()
+    }], associationFields.length > 0 ? [{
+      type: 'divider'
     }, {
+      type: 'itemGroup',
+      title: t('Display association fields'),
+      children: associationFields
+    }] : [], [{
       type: 'divider'
     }, {
       type: 'item',
@@ -44,7 +56,7 @@ var ReadPrettyFormItemInitializers = function ReadPrettyFormItemInitializers(pro
           content: t('This is a demo text, **supports Markdown syntax**.')
         }
       }
-    }],
+    }]),
     insertPosition: insertPosition,
     component: component,
     title: component ? null : t('Configure fields')

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

@@ -5,7 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.RecordBlockInitializers = void 0;
 
-var _react = _interopRequireDefault(require("react"));
+var _react = require("@formily/react");
+
+var _react2 = _interopRequireDefault(require("react"));
 
 var _reactI18next = require("react-i18next");
 
@@ -15,9 +17,37 @@ var _utils = require("../utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+var recursiveParent = function recursiveParent(schema) {
+  var _schema$xDecorator;
+
+  if (!schema) return null;
+
+  if ((_schema$xDecorator = schema['x-decorator']) === null || _schema$xDecorator === void 0 ? void 0 : _schema$xDecorator.endsWith('BlockProvider')) {
+    var _schema$xDecoratorP;
+
+    return (_schema$xDecoratorP = schema['x-decorator-props']) === null || _schema$xDecoratorP === void 0 ? void 0 : _schema$xDecoratorP['collection'];
+  } else {
+    return recursiveParent(schema.parent);
+  }
+};
+
 var useRelationFields = function useRelationFields() {
-  var _useCollection = (0, _.useCollection)(),
-      fields = _useCollection.fields;
+  var fieldSchema = (0, _react.useFieldSchema)();
+
+  var _useCollectionManager = (0, _.useCollectionManager)(),
+      getCollectionFields = _useCollectionManager.getCollectionFields;
+
+  var fields = [];
+
+  if (fieldSchema['x-initializer']) {
+    fields = (0, _.useCollection)().fields;
+  } else {
+    var collection = recursiveParent(fieldSchema.parent);
+
+    if (collection) {
+      fields = getCollectionFields(collection);
+    }
+  }
 
   var relationFields = fields.filter(function (field) {
     return ['linkTo', 'subTable', 'o2m', 'm2m', 'obo', 'oho', 'o2o', 'm2o'].includes(field.interface);
@@ -100,7 +130,7 @@ var RecordBlockInitializers = function RecordBlockInitializers(props) {
 
   var insertPosition = props.insertPosition,
       component = props.component;
-  return /*#__PURE__*/_react.default.createElement(_.SchemaInitializer.Button, {
+  return /*#__PURE__*/_react2.default.createElement(_.SchemaInitializer.Button, {
     wrap: _utils.gridRowColWrap,
     insertPosition: insertPosition,
     component: component,

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

@@ -43,6 +43,17 @@ var TableActionInitializers = {
           skipScopeCheck: true
         }
       }
+    }, {
+      type: 'item',
+      title: "{{t('Refresh')}}",
+      component: 'RefreshActionInitializer',
+      schema: {
+        'x-align': 'right',
+        'x-decorator': 'ACLActionProvider',
+        'x-acl-action-props': {
+          skipScopeCheck: true
+        }
+      }
     }]
   }]
 };

package/lib/schema-initializer/components/assigned-field/AssignedField.d.ts

@@ -1 +1,5 @@
+export declare enum AssignedFieldValueType {
+    ConstantValue = "constantValue",
+    DynamicValue = "dynamicValue"
+}
 export declare const AssignedField: (props: any) => JSX.Element;