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

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

@@ -23,7 +23,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 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; }
 
-import { RecursionField, useFieldSchema } from '@formily/react';
+import { RecursionField, useField, useFieldSchema } from '@formily/react';
 import { Select } from 'antd';
 import React, { createContext, useContext, useEffect, useState } from 'react';
 import { useTableSelectorProps as useTsp } from '../../../block-provider/TableSelectorProvider';
@@ -32,34 +32,48 @@ import { FormProvider, SchemaComponentOptions } from '../../core';
 import { useCompile } from '../../hooks';
 import { ActionContext, useActionContext } from '../action';
 import { useFieldNames } from './useFieldNames';
+import { differenceBy, unionBy } from 'lodash';
 var RecordPickerContext = /*#__PURE__*/createContext(null);
 
 var useTableSelectorProps = function useTableSelectorProps() {
+  var field = useField();
+
   var _useContext = useContext(RecordPickerContext),
       multiple = _useContext.multiple,
       value = _useContext.value,
       setSelectedRows = _useContext.setSelectedRows,
-      selectedRows = _useContext.selectedRows;
+      rcSelectRows = _useContext.selectedRows;
 
   var _useTsp = useTsp(),
       _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 = differenceBy(allSelectedRows, scopeRows, rowKey || 'id');
+        var unionSelectedRows = 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);
+      }
     }
   });
 };
@@ -137,13 +151,13 @@ export var InputRecordPicker = function InputRecordPicker(props) {
       setSelectedRows(opts);
     }
   }, [value]);
-  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__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Select, _objectSpread(_objectSpread({}, others), {}, {

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

@@ -12,7 +12,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { observer, RecursionField, useField, useFieldSchema } from '@formily/react';
 import { toArr } from '@formily/shared';
-import React, { useRef, useState } from 'react';
+import React, { Fragment, useRef, useState } from 'react';
 import { BlockAssociationContext, WithoutTableFieldResource } from '../../../block-provider';
 import { CollectionProvider, useCollection, useCollectionManager } from '../../../collection-manager';
 import { RecordProvider, useRecord } from '../../../record-provider';
@@ -57,7 +57,9 @@ export var ReadPrettyRecordPicker = observer(function (props) {
 
   var renderRecords = function renderRecords() {
     return toArr(field.value).map(function (record, index, arr) {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("a", {
+      return /*#__PURE__*/React.createElement(Fragment, {
+        key: "".concat(record.id, "_").concat(index)
+      }, /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("a", {
         onClick: function onClick(e) {
           var _ellipsisWithTooltipR;
 

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

@@ -71,8 +71,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__*/React.createElement(RecordIndexProvider, {
           index: index
         }, /*#__PURE__*/React.createElement(RecordProvider, {

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

@@ -13,7 +13,7 @@ import { useAttach } from '../../hooks';
 import { TableArray } from './Table.Array';
 
 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;
@@ -27,6 +27,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/es/schema-component/antd/table-v2/Table.js

@@ -48,8 +48,7 @@ var useTableColumns = function useTableColumns() {
 
   var _useSchemaInitializer = 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)) {
@@ -64,7 +63,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__*/React.createElement(RecursionField, {
         name: s.name,
@@ -80,7 +78,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__*/React.createElement(RecordIndexProvider, {
           index: index
         }, /*#__PURE__*/React.createElement(RecordProvider, {

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

@@ -1,14 +1,20 @@
-import { formatMomentValue, usePrefixCls } from '@formily/antd/lib/__builtins__';
-import { isArr } from '@formily/shared';
+import { usePrefixCls } from '@formily/antd/lib/__builtins__';
+import { toArr } from '@formily/shared';
 import cls from 'classnames';
+import moment from 'moment';
 import React from 'react';
 export 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 = usePrefixCls('description-text', props);
+  var values = toArr(value);
 
   var getLabels = function getLabels() {
-    var labels = formatMomentValue(props.value, props.format, placeholder);
-    return isArr(labels) ? labels.join('~') : labels;
+    var labels = values.map(function (v) {
+      return moment(v, 'HH:mm:ss').format(format);
+    });
+    return labels.join('~');
   };
 
   return /*#__PURE__*/React.createElement("div", {

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

@@ -724,6 +724,27 @@ export 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 (Schema.isSchemaInstance(schema)) {
         if (this.parentsIn(schema)) {
@@ -747,27 +768,6 @@ export var Designable = /*#__PURE__*/function () {
         schema = cloneDeep(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 || uid(), wrapped);

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

@@ -9,6 +9,6 @@ export 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 merge(props1 || {}, props2, options);
 };

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

@@ -1,7 +1,8 @@
+import { union } from 'lodash';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { SchemaInitializer } from '../SchemaInitializer';
-import { gridRowColWrap, useFormItemInitializerFields } from '../utils'; // 表单里配置字段
+import { gridRowColWrap, useAssociatedFormItemInitializerFields, useFormItemInitializerFields } from '../utils'; // 表单里配置字段
 
 export var FormItemInitializers = function FormItemInitializers(props) {
   var _useTranslation = useTranslation(),
@@ -9,14 +10,24 @@ export var FormItemInitializers = function FormItemInitializers(props) {
 
   var insertPosition = props.insertPosition,
       component = props.component;
+  var associationFields = useAssociatedFormItemInitializerFields({
+    readPretty: true,
+    block: 'Form'
+  });
   return /*#__PURE__*/React.createElement(SchemaInitializer.Button, {
     wrap: gridRowColWrap,
     icon: 'SettingOutlined',
-    items: [{
+    items: union([{
       type: 'itemGroup',
       title: t('Display fields'),
       children: useFormItemInitializerFields()
+    }], associationFields.length > 0 ? [{
+      type: 'divider'
     }, {
+      type: 'itemGroup',
+      title: t('Display association fields'),
+      children: associationFields
+    }] : [], [{
       type: 'divider'
     }, {
       type: 'item',
@@ -32,7 +43,7 @@ export 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/es/schema-initializer/buttons/ReadPrettyFormActionInitializers.js

@@ -27,6 +27,14 @@ export 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/es/schema-initializer/buttons/ReadPrettyFormItemInitializers.js

@@ -1,21 +1,32 @@
+import { union } from 'lodash';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { SchemaInitializer } from '../SchemaInitializer';
-import { gridRowColWrap, useFormItemInitializerFields } from '../utils';
+import { gridRowColWrap, useAssociatedFormItemInitializerFields, useFormItemInitializerFields } from '../utils';
 export var ReadPrettyFormItemInitializers = function ReadPrettyFormItemInitializers(props) {
   var _useTranslation = useTranslation(),
       t = _useTranslation.t;
 
   var insertPosition = props.insertPosition,
       component = props.component;
+  var associationFields = useAssociatedFormItemInitializerFields({
+    readPretty: true,
+    block: 'Form'
+  });
   return /*#__PURE__*/React.createElement(SchemaInitializer.Button, {
     wrap: gridRowColWrap,
     icon: 'SettingOutlined',
-    items: [{
+    items: union([{
       type: 'itemGroup',
       title: t('Display fields'),
       children: useFormItemInitializerFields()
+    }], associationFields.length > 0 ? [{
+      type: 'divider'
     }, {
+      type: 'itemGroup',
+      title: t('Display association fields'),
+      children: associationFields
+    }] : [], [{
       type: 'divider'
     }, {
       type: 'item',
@@ -31,7 +42,7 @@ export var ReadPrettyFormItemInitializers = function ReadPrettyFormItemInitializ
           content: t('This is a demo text, **supports Markdown syntax**.')
         }
       }
-    }],
+    }]),
     insertPosition: insertPosition,
     component: component,
     title: component ? null : t('Configure fields')

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

@@ -1,11 +1,40 @@
+import { useFieldSchema } from '@formily/react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { SchemaInitializer, useCollection } from '../..';
+import { SchemaInitializer, useCollection, useCollectionManager } from '../..';
 import { gridRowColWrap } from '../utils';
 
+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 = useCollection(),
-      fields = _useCollection.fields;
+  var fieldSchema = useFieldSchema();
+
+  var _useCollectionManager = useCollectionManager(),
+      getCollectionFields = _useCollectionManager.getCollectionFields;
+
+  var fields = [];
+
+  if (fieldSchema['x-initializer']) {
+    fields = 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);

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

@@ -37,6 +37,17 @@ export 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/es/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;