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

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/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-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/components/assigned-field/AssignedField.js

@@ -9,6 +9,8 @@ exports.AssignedFieldValueType = exports.AssignedField = void 0;
 
 var _react = require("@formily/react");
 
+var _shared = require("@formily/shared");
+
 var _antd = require("antd");
 
 var _react2 = _interopRequireWildcard(require("react"));
@@ -99,10 +101,11 @@ var InternalField = function InternalField(props) {
     }
 
     setRequired(); // @ts-ignore
-    // field.dataSource = uiSchema.enum;
-    // const originalProps = compile(uiSchema['x-component-props']) || {};
-    // const componentProps = merge(originalProps, field.componentProps || {});
-    // field.component = [component, componentProps];
+
+    field.dataSource = uiSchema.enum;
+    var originalProps = compile(uiSchema['x-component-props']) || {};
+    var componentProps = (0, _shared.merge)(originalProps, field.componentProps || {});
+    field.componentProps = componentProps; // field.component = [component, componentProps];
   }, [JSON.stringify(uiSchema)]);
 
   if (!uiSchema) {

package/lib/schema-initializer/items/index.js

@@ -471,9 +471,10 @@ var KanbanBlockInitializer = function KanbanBlockInitializer(props) {
                     schema: {
                       properties: {
                         groupField: {
-                          title: t('Group field'),
+                          title: t('Grouping field'),
                           enum: fields,
                           required: true,
+                          description: '{{t("Single select and radio fields can be used as the grouping field")}}',
                           'x-component': 'Select',
                           'x-component-props': {
                             objectValue: true,

package/lib/schema-initializer/utils.js

@@ -433,11 +433,27 @@ var removeSchema = function removeSchema(schema, cb) {
   return cb(schema);
 };
 
+var recursiveParent = function recursiveParent(schema) {
+  if (!schema.parent) return null;
+  if (schema.parent['x-initializer']) return schema.parent;
+  return recursiveParent(schema.parent);
+};
+
 var useCurrentSchema = function useCurrentSchema(action, key) {
+  var _fieldSchema;
+
   var find = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : findSchema;
   var rm = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : removeSchema;
   var fieldSchema = (0, _react.useFieldSchema)();
 
+  if (!((_fieldSchema = fieldSchema) === null || _fieldSchema === void 0 ? void 0 : _fieldSchema['x-initializer'])) {
+    var recursiveInitializerSchema = recursiveParent(fieldSchema);
+
+    if (recursiveInitializerSchema) {
+      fieldSchema = recursiveInitializerSchema;
+    }
+  }
+
   var _useDesignable = (0, _schemaComponent.useDesignable)(),
       _remove = _useDesignable.remove;
 

package/lib/schema-settings/SchemaSettings.js

@@ -578,6 +578,8 @@ SchemaSettings.Remove = function (props) {
   var _useTranslation3 = (0, _reactI18next.useTranslation)(),
       t = _useTranslation3.t;
 
+  var field = (0, _react.useField)();
+  var fieldSchema = (0, _react.useFieldSchema)();
   var ctx = (0, _BlockTemplate.useBlockTemplateContext)();
   return /*#__PURE__*/_react2.default.createElement(SchemaSettings.Item, {
     onClick: function onClick() {
@@ -591,6 +593,11 @@ SchemaSettings.Remove = function (props) {
             breakRemoveOn: breakRemoveOn
           };
 
+          if (field && field.required) {
+            field.required = false;
+            fieldSchema['required'] = false;
+          }
+
           if (template && (ctx === null || ctx === void 0 ? void 0 : ctx.dn)) {
             ctx === null || ctx === void 0 ? void 0 : ctx.dn.remove(null, options);
           } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client",
-  "version": "0.7.3-alpha.1",
+  "version": "0.7.4-alpha.7",
   "license": "Apache-2.0",
   "licenses": [
     {
@@ -19,8 +19,8 @@
     "@formily/antd": "2.0.20",
     "@formily/core": "2.0.20",
     "@formily/react": "2.0.20",
-    "@nocobase/sdk": "0.7.3-alpha.1",
-    "@nocobase/utils": "0.7.3-alpha.1",
+    "@nocobase/sdk": "0.7.4-alpha.7",
+    "@nocobase/utils": "0.7.4-alpha.7",
     "ahooks": "^3.0.5",
     "antd": "~4.19.5",
     "axios": "^0.26.1",
@@ -35,6 +35,7 @@
     "react-contenteditable": "^3.3.6",
     "react-drag-listview": "^0.1.9",
     "react-helmet": "^6.1.0",
+    "react-hotkeys-hook": "^3.4.7",
     "react-i18next": "^11.15.1",
     "react-image-lightbox": "^5.1.4",
     "react-quill": "^1.3.5",
@@ -54,5 +55,5 @@
     "@types/marked": "^4.0.1",
     "axios-mock-adapter": "^1.20.0"
   },
-  "gitHead": "09597f41800ec567f64000e928cd68c28bb927e3"
+  "gitHead": "77f22e6da464d19be111835316faf4b94cd80413"
 }