@nocobase/client 0.9.2-alpha.4 → 0.9.4-alpha.1

package/lib/schema-settings/SchemaSettings.js

@@ -23,6 +23,7 @@ var _utilts = require("../schema-component/antd/association-filter/utilts");
 var _schemaTemplates = require("../schema-templates");
 var _BlockTemplate = require("../schema-templates/BlockTemplate");
 var _DataTemplates = require("./DataTemplates");
+var _EnableChildCollections = require("./EnableChildCollections");
 var _LinkageRules = require("./LinkageRules");
 var _actionHooks = require("./LinkageRules/action-hooks");
 var _templateObject;
@@ -963,6 +964,9 @@ SchemaSettings.ModalItem = function ModalItem(props) {
                 effects: effects
               }).then(function (values) {
                 onSubmit(values);
+                return values;
+              }).catch(function (err) {
+                console.error(err);
               });
             case 9:
             case "end":
@@ -1049,6 +1053,7 @@ SchemaSettings.DefaultSortingRules = function DefaultSortingRules(props) {
                   field: {
                     type: 'string',
                     enum: sortFields,
+                    required: true,
                     'x-decorator': 'FormItem',
                     'x-component': 'Select',
                     'x-component-props': {
@@ -1159,8 +1164,13 @@ SchemaSettings.LinkageRules = function LinkageRules(props) {
     }
   });
 };
-var useDataTemplates = function useDataTemplates() {
+var useDataTemplates = function useDataTemplates(schema) {
   var fieldSchema = (0, _react.useFieldSchema)();
+  if (schema) {
+    return {
+      templateData: _lodash.default.cloneDeep(schema['x-data-templates'])
+    };
+  }
   var formSchema = (0, _2.findFormBlock)(fieldSchema) || fieldSchema;
   return {
     templateData: _lodash.default.cloneDeep(formSchema === null || formSchema === void 0 ? void 0 : formSchema['x-data-templates'])
@@ -1168,6 +1178,7 @@ var useDataTemplates = function useDataTemplates() {
 };
 exports.useDataTemplates = useDataTemplates;
 SchemaSettings.DataTemplates = function DataTemplates(props) {
+  var designerCtx = (0, _react2.useContext)(_2.SchemaComponentContext);
   var collectionName = props.collectionName;
   var fieldSchema = (0, _react.useFieldSchema)();
   var _useDesignable4 = (0, _2.useDesignable)(),
@@ -1177,20 +1188,16 @@ SchemaSettings.DataTemplates = function DataTemplates(props) {
   var formSchema = (0, _2.findFormBlock)(fieldSchema) || fieldSchema;
   var _useDataTemplates = useDataTemplates(),
     templateData = _useDataTemplates.templateData;
-  return /*#__PURE__*/_react2.default.createElement(SchemaSettings.ModalItem, {
-    title: t('Form data templates'),
-    components: {
-      ArrayCollapse: _antd.ArrayCollapse,
-      FormLayout: _antd.FormLayout
-    },
-    width: 770,
-    schema: {
+  var schema = (0, _react2.useMemo)(function () {
+    return {
       type: 'object',
       title: t('Form data templates'),
       properties: {
         fieldReaction: {
           'x-component': _DataTemplates.FormDataTemplates,
           'x-component-props': {
+            designerCtx: designerCtx,
+            formSchema: formSchema,
             useProps: function useProps() {
               return {
                 defaultValues: templateData,
@@ -1200,20 +1207,40 @@ SchemaSettings.DataTemplates = function DataTemplates(props) {
           }
         }
       }
-    },
-    onSubmit: function onSubmit(v) {
-      var _schema5;
-      var data = v.fieldReaction || {};
-      var schema = (_schema5 = {}, _defineProperty(_schema5, 'x-uid', formSchema['x-uid']), _defineProperty(_schema5, 'x-data-templates', data), _schema5);
-      formSchema['x-data-templates'] = data;
-      dn.emit('patch', {
-        schema: schema
-      });
-      dn.refresh();
-    }
+    };
+  }, [templateData]);
+  var onSubmit = (0, _react2.useCallback)(function (v) {
+    var _schema5;
+    var data = _objectSpread(_objectSpread({}, formSchema['x-data-templates'] || {}), v.fieldReaction);
+    // 当 Tree 组件开启 checkStrictly 属性时，会导致 checkedKeys 的值是一个对象，而不是数组，所以这里需要转换一下以支持旧版本
+    data.items.forEach(function (item) {
+      item.fields = Array.isArray(item.fields) ? item.fields : item.fields.checked;
+    });
+    var schema = (_schema5 = {}, _defineProperty(_schema5, 'x-uid', formSchema['x-uid']), _defineProperty(_schema5, 'x-data-templates', data), _schema5);
+    formSchema['x-data-templates'] = data;
+    dn.emit('patch', {
+      schema: schema
+    });
+    dn.refresh();
+  }, []);
+  var title = (0, _react2.useMemo)(function () {
+    return t('Form data templates');
+  }, []);
+  var components = (0, _react2.useMemo)(function () {
+    return {
+      ArrayCollapse: _antd.ArrayCollapse,
+      FormLayout: _antd.FormLayout
+    };
+  }, []);
+  return /*#__PURE__*/_react2.default.createElement(SchemaSettings.ModalItem, {
+    title: title,
+    components: components,
+    width: 770,
+    schema: schema,
+    onSubmit: onSubmit
   });
 };
-SchemaSettings.EnableChildCollections = function EnableChildCollections(props) {
+SchemaSettings.EnableChildCollections = function EnableChildCollectionsItem(props) {
   var collectionName = props.collectionName;
   var fieldSchema = (0, _react.useFieldSchema)();
   var _useDesignable5 = (0, _2.useDesignable)(),
@@ -1233,7 +1260,7 @@ SchemaSettings.EnableChildCollections = function EnableChildCollections(props) {
       title: t('Enable child collections'),
       properties: {
         enableChildren: {
-          'x-component': EnableChildCollections,
+          'x-component': _EnableChildCollections.EnableChildCollections,
           'x-component-props': {
             useProps: function useProps() {
               return {
@@ -1253,7 +1280,6 @@ SchemaSettings.EnableChildCollections = function EnableChildCollections(props) {
       }
     },
     onSubmit: function onSubmit(v) {
-      console.log(v);
       var enableChildren = [];
       var _iterator2 = _createForOfIteratorHelper(v.enableChildren.childrenCollections),
         _step2;
@@ -1271,16 +1297,14 @@ SchemaSettings.EnableChildCollections = function EnableChildCollections(props) {
       var schema = _defineProperty({}, 'x-uid', uid);
       fieldSchema['x-enable-children'] = enableChildren;
       fieldSchema['x-allow-add-to-current'] = v.allowAddToCurrent;
-      fieldSchema['x-component-props'] = {
-        openMode: 'drawer',
+      fieldSchema['x-component-props'] = _objectSpread(_objectSpread({}, fieldSchema['x-component-props']), {}, {
         component: 'CreateRecordAction'
-      };
+      });
       schema['x-enable-children'] = enableChildren;
       schema['x-allow-add-to-current'] = v.allowAddToCurrent;
-      schema['x-component-props'] = {
-        openMode: 'drawer',
+      schema['x-component-props'] = _objectSpread(_objectSpread({}, fieldSchema['x-component-props']), {}, {
         component: 'CreateRecordAction'
-      };
+      });
       dn.emit('patch', {
         schema: schema
       });

package/lib/schema-settings/VariableInput/hooks/useUserVariable.js

@@ -17,7 +17,7 @@ var getChildren = function getChildren(options, _ref) {
     return [];
   }
   var result = options.map(function (option) {
-    if (option.type !== 'belongsTo' && option.type !== 'hasOne' || !option.target) {
+    if (!option.target) {
       var _option$schema;
       return {
         key: option.name,

package/lib/schema-settings/hooks/useIsShowMultipleSwitch.d.ts

@@ -0,0 +1,4 @@
+/**
+ * 是否显示 `允许多选` 开关
+ */
+export declare function useIsShowMultipleSwitch(): () => boolean;

package/lib/schema-settings/hooks/useIsShowMultipleSwitch.js

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useIsShowMultipleSwitch = useIsShowMultipleSwitch;
+var _react = require("@formily/react");
+var _collectionManager = require("../../collection-manager");
+/**
+ * 是否显示 `允许多选` 开关
+ */
+function useIsShowMultipleSwitch() {
+  var _uiSchema$xComponent;
+  var field = (0, _react.useField)();
+  var fieldSchema = (0, _react.useFieldSchema)();
+  var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
+    getCollectionField = _useCollectionManager.getCollectionField;
+  var collectionField = fieldSchema['x-collection-field'] ? getCollectionField(fieldSchema['x-collection-field']) : null;
+  var uiSchema = (collectionField === null || collectionField === void 0 ? void 0 : collectionField.uiSchema) || fieldSchema;
+  var hasMultiple = ((_uiSchema$xComponent = uiSchema['x-component-props']) === null || _uiSchema$xComponent === void 0 ? void 0 : _uiSchema$xComponent.multiple) === true;
+  return function IsShowMultipleSwitch() {
+    return !field.readPretty && fieldSchema['x-component'] !== 'TableField' && hasMultiple;
+  };
+}

package/lib/user/CurrentUser.js

@@ -52,6 +52,43 @@ var CurrentUser = function CurrentUser() {
     setVisible = _useState2[1];
   var _useCurrentUserContex = (0, _.useCurrentUserContext)(),
     data = _useCurrentUserContex.data;
+  var _useACLRoleContext = (0, _.useACLRoleContext)(),
+    allowAll = _useACLRoleContext.allowAll,
+    snippets = _useACLRoleContext.snippets;
+  var appAllowed = allowAll || (snippets === null || snippets === void 0 ? void 0 : snippets.includes('app'));
+  var silenceApi = (0, _.useAPIClient)();
+  var check = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return new Promise(function (resolve) {
+              var heartbeat = setInterval(function () {
+                silenceApi.silent().resource('app').getInfo().then(function (res) {
+                  console.log(res);
+                  if ((res === null || res === void 0 ? void 0 : res.status) === 200) {
+                    resolve('ok');
+                    clearInterval(heartbeat);
+                  }
+                  return res;
+                }).catch(function () {
+                  // ignore
+                });
+              }, 3000);
+            });
+          case 2:
+            return _context.abrupt("return", _context.sent);
+          case 3:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function check() {
+      return _ref.apply(this, arguments);
+    };
+  }();
   return /*#__PURE__*/_react.default.createElement("div", {
     style: {
       display: 'inline-flex',
@@ -67,26 +104,97 @@ var CurrentUser = function CurrentUser() {
     onVisibleChange: function onVisibleChange(visible) {
       setVisible(visible);
     },
-    overlay: /*#__PURE__*/_react.default.createElement(_antd.Menu, null, /*#__PURE__*/_react.default.createElement(ApplicationVersion, null), /*#__PURE__*/_react.default.createElement(_antd.Menu.Divider, null), /*#__PURE__*/_react.default.createElement(_EditProfile.EditProfile, null), /*#__PURE__*/_react.default.createElement(_ChangePassword.ChangePassword, null), /*#__PURE__*/_react.default.createElement(_SwitchRole.SwitchRole, null), /*#__PURE__*/_react.default.createElement(_LanguageSettings.LanguageSettings, null), /*#__PURE__*/_react.default.createElement(_ThemeSettings.ThemeSettings, null), /*#__PURE__*/_react.default.createElement(_antd.Menu.Divider, null), /*#__PURE__*/_react.default.createElement(_antd.Menu.Item, {
+    overlay: /*#__PURE__*/_react.default.createElement(_antd.Menu, null, /*#__PURE__*/_react.default.createElement(ApplicationVersion, null), /*#__PURE__*/_react.default.createElement(_antd.Menu.Divider, null), /*#__PURE__*/_react.default.createElement(_EditProfile.EditProfile, null), /*#__PURE__*/_react.default.createElement(_ChangePassword.ChangePassword, null), /*#__PURE__*/_react.default.createElement(_antd.Menu.Divider, null), /*#__PURE__*/_react.default.createElement(_SwitchRole.SwitchRole, null), /*#__PURE__*/_react.default.createElement(_LanguageSettings.LanguageSettings, null), /*#__PURE__*/_react.default.createElement(_ThemeSettings.ThemeSettings, null), /*#__PURE__*/_react.default.createElement(_antd.Menu.Divider, null), appAllowed && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Menu.Item, {
+      key: "cache",
+      onClick: function () {
+        var _onClick = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+            while (1) switch (_context2.prev = _context2.next) {
+              case 0:
+                _context2.next = 2;
+                return api.resource('app').clearCache();
+              case 2:
+                window.location.reload();
+              case 3:
+              case "end":
+                return _context2.stop();
+            }
+          }, _callee2);
+        }));
+        function onClick() {
+          return _onClick.apply(this, arguments);
+        }
+        return onClick;
+      }()
+    }, t('Clear cache')), /*#__PURE__*/_react.default.createElement(_antd.Menu.Item, {
+      key: "reboot",
+      onClick: function () {
+        var _onClick2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+          return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+            while (1) switch (_context4.prev = _context4.next) {
+              case 0:
+                _antd.Modal.confirm({
+                  title: t('Reboot application'),
+                  content: t('The will interrupt service, it may take a few seconds to restart. Are you sure to continue?'),
+                  okText: t('Reboot'),
+                  okButtonProps: {
+                    danger: true
+                  },
+                  onOk: function () {
+                    var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+                      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+                        while (1) switch (_context3.prev = _context3.next) {
+                          case 0:
+                            _context3.next = 2;
+                            return api.resource('app').reboot();
+                          case 2:
+                            _context3.next = 4;
+                            return check();
+                          case 4:
+                            window.location.reload();
+                          case 5:
+                          case "end":
+                            return _context3.stop();
+                        }
+                      }, _callee3);
+                    }));
+                    function onOk() {
+                      return _onOk.apply(this, arguments);
+                    }
+                    return onOk;
+                  }()
+                });
+              case 1:
+              case "end":
+                return _context4.stop();
+            }
+          }, _callee4);
+        }));
+        function onClick() {
+          return _onClick2.apply(this, arguments);
+        }
+        return onClick;
+      }()
+    }, t('Reboot application')), /*#__PURE__*/_react.default.createElement(_antd.Menu.Divider, null)), /*#__PURE__*/_react.default.createElement(_antd.Menu.Item, {
       key: "signout",
       onClick: function () {
-        var _onClick = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-          return _regeneratorRuntime().wrap(function _callee$(_context) {
-            while (1) switch (_context.prev = _context.next) {
+        var _onClick3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+          return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+            while (1) switch (_context5.prev = _context5.next) {
               case 0:
-                _context.next = 2;
+                _context5.next = 2;
                 return api.resource('users').signout();
               case 2:
                 api.auth.setToken(null);
                 history.push('/signin');
               case 4:
               case "end":
-                return _context.stop();
+                return _context5.stop();
             }
-          }, _callee);
+          }, _callee5);
         }));
         function onClick() {
-          return _onClick.apply(this, arguments);
+          return _onClick3.apply(this, arguments);
         }
         return onClick;
       }()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client",
-  "version": "0.9.2-alpha.4",
+  "version": "0.9.4-alpha.1",
   "license": "Apache-2.0",
   "main": "lib",
   "module": "es/index.js",
@@ -13,9 +13,9 @@
     "@formily/antd": "2.0.20",
     "@formily/core": "2.0.20",
     "@formily/react": "2.0.20",
-    "@nocobase/evaluators": "0.9.2-alpha.4",
-    "@nocobase/sdk": "0.9.2-alpha.4",
-    "@nocobase/utils": "0.9.2-alpha.4",
+    "@nocobase/evaluators": "0.9.4-alpha.1",
+    "@nocobase/sdk": "0.9.4-alpha.1",
+    "@nocobase/utils": "0.9.4-alpha.1",
     "ahooks": "^3.7.2",
     "antd": "^4.24.8",
     "axios": "^0.26.1",
@@ -25,7 +25,6 @@
     "file-saver": "^2.0.5",
     "i18next": "^22.4.9",
     "i18next-http-backend": "^2.1.1",
-    "json-templates": "^4.2.0",
     "markdown-it": "13.0.1",
     "markdown-it-highlightjs": "3.3.1",
     "mathjs": "^10.6.0",
@@ -60,5 +59,5 @@
     "@types/markdown-it-highlightjs": "3.3.1",
     "axios-mock-adapter": "^1.20.0"
   },
-  "gitHead": "96cb023f353a4fb099dea074c575be65ebab813f"
+  "gitHead": "0b4936be557be918dbdf8196dadcbc7eb395906d"
 }

package/tsconfig.json

@@ -0,0 +1,8 @@
+{
+  "extends": "../../../tsconfig.json",
+  "compilerOptions": {
+    "types": [
+      "vitest/globals"
+    ]
+  },
+}