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

package/lib/schema-component/antd/tabs/Tabs.Designer.js

@@ -39,28 +39,39 @@ var TabsDesigner = function TabsDesigner() {
       properties: {
         title: {
           title: t('Tab name'),
+          required: true,
           'x-decorator': 'FormItem',
           'x-component': 'Input',
           'x-component-props': {}
+        },
+        icon: {
+          title: t('Icon'),
+          'x-decorator': 'FormItem',
+          'x-component': 'IconPicker',
+          'x-component-props': {}
         }
       }
     },
     initialValues: {
-      title: field.title
+      title: field.title,
+      icon: field.componentProps.icon
     },
     onSubmit: function onSubmit(_ref) {
-      var title = _ref.title;
+      var _schema;
 
-      if (title) {
-        var _schema;
-
-        fieldSchema.title = title;
-        field.title = title;
-        dn.emit('patch', {
-          schema: (_schema = {}, _defineProperty(_schema, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema, "title", title), _schema)
-        });
-        dn.refresh();
-      }
+      var title = _ref.title,
+          icon = _ref.icon;
+      var props = fieldSchema['x-component-props'] || {};
+      fieldSchema.title = title;
+      field.title = title;
+      props.icon = icon;
+      field.componentProps.icon = icon;
+      fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+      fieldSchema['x-component-props'].icon = icon;
+      dn.emit('patch', {
+        schema: (_schema = {}, _defineProperty(_schema, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema, "title", title), _defineProperty(_schema, 'x-component-props', props), _schema)
+      });
+      dn.refresh();
     }
   }), /*#__PURE__*/_react2.default.createElement(_2.SchemaSettings.Divider, null), /*#__PURE__*/_react2.default.createElement(_2.SchemaSettings.Remove, null));
 };

package/lib/schema-component/antd/tabs/Tabs.js

@@ -15,6 +15,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _react2 = _interopRequireDefault(require("react"));
 
+var _icon = require("../../../icon");
+
 var _schemaInitializer = require("../../../schema-initializer");
 
 var _common = require("../../common");
@@ -61,6 +63,11 @@ Tabs.TabPane = (0, _react.observer)(function (props) {
   var field = (0, _react.useField)();
   return /*#__PURE__*/_react2.default.createElement(_common.SortableItem, {
     className: (0, _classnames.default)('nb-action-link', designerCss, props.className)
-  }, props.tab || field.title, /*#__PURE__*/_react2.default.createElement(Designer, null));
+  }, props.icon && /*#__PURE__*/_react2.default.createElement(_icon.Icon, {
+    style: {
+      marginRight: 2
+    },
+    type: props.icon
+  }), " ", props.tab || field.title, /*#__PURE__*/_react2.default.createElement(Designer, null));
 });
 Tabs.Designer = _Tabs.TabsDesigner;

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/core/DesignableSwitch.js

@@ -15,6 +15,8 @@ var _ = require("..");
 
 var _pluginManager = require("../../plugin-manager");
 
+var _reactHotkeysHook = require("react-hotkeys-hook");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var DesignableSwitch = function DesignableSwitch() {
@@ -29,12 +31,17 @@ var DesignableSwitch = function DesignableSwitch() {
 
   if (designable) {
     style['backgroundColor'] = '#f18b62';
-  }
+  } // 快捷键切换编辑状态
+
 
+  (0, _reactHotkeysHook.useHotkeys)('Ctrl+Shift+U', function () {
+    return setDesignable(!designable);
+  }, [designable]);
   return /*#__PURE__*/_react.default.createElement(_pluginManager.PluginManager.Toolbar.Item, {
     selected: designable,
     icon: /*#__PURE__*/_react.default.createElement(_icons.HighlightOutlined, null),
     title: t('UI Editor'),
+    subtitle: 'Ctrl+Shift+U',
     style: style,
     onClick: function onClick() {
       setDesignable(!designable);

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/TabPaneInitializers.js

@@ -32,7 +32,8 @@ var TabPaneInitializers = function TabPaneInitializers() {
     return {
       run: function run() {
         return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-          var title;
+          var _form$values, title, icon;
+
           return regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) {
               switch (_context.prev = _context.next) {
@@ -41,13 +42,15 @@ var TabPaneInitializers = function TabPaneInitializers() {
                   return form.submit();
 
                 case 2:
-                  title = form.values.title;
+                  _form$values = form.values, title = _form$values.title, icon = _form$values.icon;
                   insertBeforeEnd({
                     type: 'void',
                     title: title,
                     'x-component': 'Tabs.TabPane',
                     'x-designer': 'Tabs.Designer',
-                    'x-component-props': {},
+                    'x-component-props': {
+                      icon: icon
+                    },
                     properties: {
                       grid: {
                         type: 'void',
@@ -106,6 +109,11 @@ var TabPaneInitializers = function TabPaneInitializers() {
                   'x-component': 'Input',
                   'x-decorator': 'FormItem'
                 },
+                icon: {
+                  title: '{{t("Icon")}}',
+                  'x-component': 'IconPicker',
+                  'x-decorator': 'FormItem'
+                },
                 footer: {
                   'x-component': 'Action.Modal.Footer',
                   type: 'void',

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;