@nocobase/client 0.7.2-alpha.7 → 0.7.4-alpha.4

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

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

@@ -11,6 +11,8 @@ var _react = require("@formily/react");
 
 var _antd = require("antd");
 
+var _lodash = require("lodash");
+
 var _react2 = _interopRequireWildcard(require("react"));
 
 var _TableSelectorProvider = require("../../../block-provider/TableSelectorProvider");
@@ -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;
 
@@ -91,7 +93,7 @@ var ReadPrettyRecordPicker = (0, _react.observer)(function (props) {
           setRecord(record);
           ellipsisWithTooltipRef === null || ellipsisWithTooltipRef === void 0 ? void 0 : (_ellipsisWithTooltipR = ellipsisWithTooltipRef.current) === null || _ellipsisWithTooltipR === void 0 ? void 0 : _ellipsisWithTooltipR.setPopoverVisible(false);
         }
-      }, compile(record === null || record === void 0 ? void 0 : record[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label) || 'label']))), index < arr.length - 1 ? /*#__PURE__*/_react2.default.createElement("span", {
+      }, compile(record === null || record === void 0 ? void 0 : record[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label) || 'label']) || (record === null || record === void 0 ? void 0 : record[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) || 'value']) || (record === null || record === void 0 ? void 0 : record.id))), index < arr.length - 1 ? /*#__PURE__*/_react2.default.createElement("span", {
         style: {
           marginRight: 4,
           color: '#aaa'

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.Column.Designer.js

@@ -128,7 +128,9 @@ var TableColumnDesigner = function TableColumnDesigner(props) {
     options: options,
     value: fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames['label'],
     onChange: function onChange(label) {
-      var fieldNames = _objectSpread(_objectSpread({}, fieldSchema['x-component-props']['fieldNames']), {}, {
+      var _collectionField$uiSc2, _fieldSchema$xCompon2;
+
+      var fieldNames = _objectSpread(_objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc2 = collectionField.uiSchema) === null || _collectionField$uiSc2 === void 0 ? void 0 : _collectionField$uiSc2['x-component-props']['fieldNames']), fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2['fieldNames']), {}, {
         label: label
       });
 

package/lib/schema-component/antd/table-v2/Table.d.ts

@@ -1,12 +1 @@
-export declare const components: {
-    header: {
-        wrapper: (props: any) => JSX.Element;
-        cell: (props: any) => JSX.Element;
-    };
-    body: {
-        wrapper: (props: any) => JSX.Element;
-        row: (props: any) => JSX.Element;
-        cell: (props: any) => JSX.Element;
-    };
-};
 export declare const Table: any;