@nocobase/client 0.9.0-alpha.2 → 0.9.1-alpha.1

package/lib/route-switch/antd/admin-layout/index.js

@@ -9,6 +9,8 @@ exports.default = exports.InternalAdminLayout = exports.AdminLayout = void 0;
 
 var _css = require("@emotion/css");
 
+var _ahooks = require("ahooks");
+
 var _antd = require("antd");
 
 var _react = _interopRequireWildcard(require("react"));
@@ -19,9 +21,7 @@ var _ = require("../../../");
 
 var _collectionManager = require("../../../collection-manager");
 
-var _ahooks = require("ahooks");
-
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11;
 
 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); }
 
@@ -202,56 +202,36 @@ var InternalAdminLayout = function InternalAdminLayout(props) {
   return /*#__PURE__*/_react.default.createElement(_antd.Layout, null, /*#__PURE__*/_react.default.createElement(_antd.Layout.Header, {
     className: (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          .ant-menu.ant-menu-dark .ant-menu-item-selected,\n          .ant-menu-submenu-popup.ant-menu-dark .ant-menu-item-selected {\n            background-color: rgba(255, 255, 255, 0.1);\n          }\n          .ant-menu-dark.ant-menu-horizontal > .ant-menu-item:hover {\n            background-color: rgba(255, 255, 255, 0.1);\n          }\n\n          position: fixed;\n          width: 100%;\n          height: 46px;\n          line-height: 46px;\n          padding: 0;\n          z-index: 100;\n        "])))
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n            position: relative;\n            width: 100%;\n            height: 100%;\n          "])))
+    className: (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n            position: relative;\n            width: 100%;\n            height: 100%;\n            display: flex;\n          "])))
   }, /*#__PURE__*/_react.default.createElement("div", {
-    style: {
-      position: 'relative',
-      zIndex: 1,
-      display: 'flex',
-      height: '100%',
-      width: 'calc(100vw - 300px)'
-    }
+    className: (0, _css.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n              position: relative;\n              z-index: 1;\n              flex: 1 1 auto;\n              display: flex;\n              height: 100%;\n            "])))
   }, /*#__PURE__*/_react.default.createElement("div", {
-    style: {
-      width: 200,
-      display: 'inline-flex',
-      color: '#fff',
-      padding: '0',
-      alignItems: 'center'
-    }
+    className: (0, _css.css)(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n                width: 200px;\n                display: inline-flex;\n                flex-shrink: 0;\n                color: #fff;\n                padding: 0;\n                align-items: center;\n              "])))
   }, /*#__PURE__*/_react.default.createElement("img", {
-    className: (0, _css.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n                  padding: 0 16px;\n                  object-fit: contain;\n                  width: 100%;\n                  height: 100%;\n                "]))),
+    className: (0, _css.css)(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n                  padding: 0 16px;\n                  object-fit: contain;\n                  width: 100%;\n                  height: 100%;\n                "]))),
     src: result === null || result === void 0 ? void 0 : (_result$data = result.data) === null || _result$data === void 0 ? void 0 : (_result$data$data = _result$data.data) === null || _result$data$data === void 0 ? void 0 : (_result$data$data$log = _result$data$data.logo) === null || _result$data$data$log === void 0 ? void 0 : _result$data$data$log.url
   })), /*#__PURE__*/_react.default.createElement("div", {
-    style: {
-      width: 'calc(100% - 590px)'
-    }
+    className: (0, _css.css)(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n                flex: 1 1 auto;\n                width: 0;\n              "])))
   }, /*#__PURE__*/_react.default.createElement(MenuEditor, {
     sideMenuRef: sideMenuRef
   }))), /*#__PURE__*/_react.default.createElement("div", {
-    style: {
-      position: 'absolute',
-      height: '100%',
-      zIndex: 10,
-      top: 0,
-      right: 0
-    }
+    className: (0, _css.css)(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n              position: relative;\n              flex-shrink: 0;\n              height: 100%;\n              z-index: 10;\n            "])))
   }, /*#__PURE__*/_react.default.createElement(_.RemotePluginManagerToolbar, null), /*#__PURE__*/_react.default.createElement(_.CurrentUser, null)))), /*#__PURE__*/_react.default.createElement("div", {
     style: {
       '--side-menu-width': "".concat(sideMenuWidth, "px")
     },
-    className: (0, _css.css)(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n          width: var(--side-menu-width);\n          overflow: hidden;\n          flex: 0 0 var(--side-menu-width);\n          max-width: var(--side-menu-width);\n          min-width: var(--side-menu-width);\n          pointer-events: none;\n          transition: background-color 0.3s ease 0s, min-width 0.3s ease 0s,\n            max-width 0.3s cubic-bezier(0.645, 0.045, 0.355, 1) 0s;\n        "])))
+    className: (0, _css.css)(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n          width: var(--side-menu-width);\n          overflow: hidden;\n          flex: 0 0 var(--side-menu-width);\n          max-width: var(--side-menu-width);\n          min-width: var(--side-menu-width);\n          pointer-events: none;\n          /* transition: background-color 0.3s ease 0s, min-width 0.3s ease 0s,\n            max-width 0.3s cubic-bezier(0.645, 0.045, 0.355, 1) 0s; */\n        "])))
   }), /*#__PURE__*/_react.default.createElement(_antd.Layout.Sider, {
-    className: (0, _css.css)(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n          height: 100%;\n          position: fixed;\n          padding-top: 46px;\n          left: 0;\n          top: 0;\n          background: rgba(0, 0, 0, 0);\n          z-index: 100;\n        "]))),
+    className: (0, _css.css)(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n          height: 100%;\n          position: fixed;\n          padding-top: 46px;\n          left: 0;\n          top: 0;\n          background: rgba(0, 0, 0, 0);\n          z-index: 100;\n        "]))),
     style: {
       display: 'none'
     },
     theme: 'light',
     ref: sideMenuRef
   }), /*#__PURE__*/_react.default.createElement(_antd.Layout.Content, {
-    className: (0, _css.css)(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n          position: relative;\n          overflow-y: auto;\n          height: 100vh;\n          max-height: 100vh;\n          > div {\n            position: relative;\n            // z-index: 1;\n          }\n          .ant-layout-footer {\n            position: absolute;\n            bottom: 0;\n            text-align: center;\n            width: 100%;\n            z-index: 0;\n            padding: 0px 50px;\n          }\n        "])))
+    className: (0, _css.css)(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n          position: relative;\n          overflow-y: auto;\n          height: 100vh;\n          max-height: 100vh;\n          > div {\n            position: relative;\n            // z-index: 1;\n          }\n          .ant-layout-footer {\n            position: absolute;\n            bottom: 0;\n            text-align: center;\n            width: 100%;\n            z-index: 0;\n            padding: 0px 50px;\n          }\n        "])))
   }, /*#__PURE__*/_react.default.createElement("header", {
-    className: (0, _css.css)(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n            height: 46px;\n            line-height: 46px;\n            background: transparent;\n            pointer-events: none;\n          "])))
+    className: (0, _css.css)(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["\n            height: 46px;\n            line-height: 46px;\n            background: transparent;\n            pointer-events: none;\n          "])))
   }), service.contentLoading ? /*#__PURE__*/_react.default.createElement(_antd.Spin, null) : props.children));
 };
 

package/lib/schema-component/antd/action/Action.Designer.js

@@ -21,6 +21,12 @@ var _ = require("../..");
 
 var _schemaSettings = require("../../../schema-settings");
 
+var _collectionManager = require("../../../collection-manager");
+
+var _recordProvider = require("../../../record-provider");
+
+var _FormBlockProvider = require("../../../block-provider/FormBlockProvider");
+
 var _utils = require("./utils");
 
 var _excluded = ["modalTip"];
@@ -76,7 +82,7 @@ var MenuGroup = function MenuGroup(props) {
 };
 
 var ActionDesigner = function ActionDesigner(props) {
-  var _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon3, _fieldSchema$xCompon4, _fieldSchema$xCompon5, _fieldSchema$xCompon6, _fieldSchema$xCompon7, _fieldSchema$xCompon8, _fieldSchema$xAction, _fieldSchema$xAction2, _fieldSchema$xAction3, _fieldSchema$xAction4, _fieldSchema$xAction5, _fieldSchema$xAction6, _fieldSchema$xAction7, _fieldSchema$xAction8, _fieldSchema$xAction9, _fieldSchema$xAction10;
+  var _fieldSchema$xAction, _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon3, _fieldSchema$xCompon4, _fieldSchema$xCompon5, _fieldSchema$xCompon6, _fieldSchema$xCompon7, _fieldSchema$xCompon8, _fieldSchema$xAction2, _fieldSchema$xAction3, _fieldSchema$xAction4, _fieldSchema$xAction5, _fieldSchema$xAction6, _fieldSchema$xAction7, _fieldSchema$xAction8, _fieldSchema$xAction9, _fieldSchema$xAction10, _fieldSchema$xAction11;
 
   var modalTip = props.modalTip,
       restProps = _objectWithoutProperties(props, _excluded);
@@ -84,23 +90,25 @@ var ActionDesigner = function ActionDesigner(props) {
   var field = (0, _react.useField)();
   var fieldSchema = (0, _react.useFieldSchema)();
 
+  var _useCollection = (0, _collectionManager.useCollection)(),
+      name = _useCollection.name;
+
   var _useDesignable = (0, _.useDesignable)(),
       dn = _useDesignable.dn;
 
   var _useTranslation2 = (0, _reactI18next.useTranslation)(),
       t = _useTranslation2.t;
 
-  var compile = (0, _.useCompile)();
   var isPopupAction = ['create', 'update', 'view', 'customize:popup'].includes(fieldSchema['x-action'] || '');
   var isUpdateModePopupAction = ['customize:bulkUpdate', 'customize:bulkEdit'].includes(fieldSchema['x-action']);
-  var context = (0, _.useActionContext)();
 
   var _useState = (0, _react2.useState)(),
       _useState2 = _slicedToArray(_useState, 2),
       initialSchema = _useState2[0],
       setInitialSchema = _useState2[1];
 
-  var actionType = fieldSchema['x-action'] || '';
+  var actionType = (_fieldSchema$xAction = fieldSchema['x-action']) !== null && _fieldSchema$xAction !== void 0 ? _fieldSchema$xAction : '';
+  var isLinkageAction = Object.keys((0, _FormBlockProvider.useFormBlockContext)()).length > 0 && Object.keys((0, _recordProvider.useRecord)()).length > 0;
   (0, _react2.useEffect)(function () {
     var schemaUid = (0, _shared.uid)();
     var schema = {
@@ -180,6 +188,8 @@ var ActionDesigner = function ActionDesigner(props) {
         dn.refresh();
       }
     }
+  }), isLinkageAction && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.LinkageRules, {
+    collectionName: name
   }), isPopupAction && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
     title: t('Open mode'),
     options: [{
@@ -246,7 +256,7 @@ var ActionDesigner = function ActionDesigner(props) {
       label: t('All'),
       value: 'all'
     }],
-    value: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction === void 0 ? void 0 : _fieldSchema$xAction['updateMode'],
+    value: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction2 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction2 === void 0 ? void 0 : _fieldSchema$xAction2['updateMode'],
     onChange: function onChange(value) {
       fieldSchema['x-action-settings']['updateMode'] = value;
       dn.emit('patch', {
@@ -257,12 +267,12 @@ var ActionDesigner = function ActionDesigner(props) {
       });
       dn.refresh();
     }
-  }), (0, _shared.isValid)(fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction2 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction2 === void 0 ? void 0 : _fieldSchema$xAction2.assignedValues) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ActionModalItem, {
+  }), (0, _shared.isValid)(fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction3 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction3 === void 0 ? void 0 : _fieldSchema$xAction3.assignedValues) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ActionModalItem, {
     title: t('Assign field values'),
     initialSchema: initialSchema,
-    initialValues: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction3 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction3 === void 0 ? void 0 : _fieldSchema$xAction3.assignedValues,
+    initialValues: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction4 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction4 === void 0 ? void 0 : _fieldSchema$xAction4.assignedValues,
     modalTip: tips[actionType],
-    uid: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction4 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction4 === void 0 ? void 0 : _fieldSchema$xAction4.schemaUid,
+    uid: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction5 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction5 === void 0 ? void 0 : _fieldSchema$xAction5.schemaUid,
     onSubmit: function onSubmit(assignedValues) {
       var _schema2;
 
@@ -272,10 +282,10 @@ var ActionDesigner = function ActionDesigner(props) {
       });
       dn.refresh();
     }
-  }), (0, _shared.isValid)(fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction5 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction5 === void 0 ? void 0 : _fieldSchema$xAction5.requestSettings) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ActionModalItem, {
+  }), (0, _shared.isValid)(fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction6 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction6 === void 0 ? void 0 : _fieldSchema$xAction6.requestSettings) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ActionModalItem, {
     title: t('Request settings'),
     schema: _utils.requestSettingsSchema,
-    initialValues: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction6 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction6 === void 0 ? void 0 : _fieldSchema$xAction6.requestSettings,
+    initialValues: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction7 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction7 === void 0 ? void 0 : _fieldSchema$xAction7.requestSettings,
     onSubmit: function onSubmit(requestSettings) {
       var _schema3;
 
@@ -285,9 +295,9 @@ var ActionDesigner = function ActionDesigner(props) {
       });
       dn.refresh();
     }
-  }), (0, _shared.isValid)(fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction7 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction7 === void 0 ? void 0 : _fieldSchema$xAction7.skipValidator) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
+  }), (0, _shared.isValid)(fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction8 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction8 === void 0 ? void 0 : _fieldSchema$xAction8.skipValidator) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
     title: t('Skip required validation'),
-    checked: !!(fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction8 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction8 === void 0 ? void 0 : _fieldSchema$xAction8.skipValidator),
+    checked: !!(fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction9 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction9 === void 0 ? void 0 : _fieldSchema$xAction9.skipValidator),
     onChange: function onChange(value) {
       var _schema4;
 
@@ -296,7 +306,7 @@ var ActionDesigner = function ActionDesigner(props) {
         schema: (_schema4 = {}, _defineProperty(_schema4, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema4, 'x-action-settings', _objectSpread({}, fieldSchema['x-action-settings'])), _schema4)
       });
     }
-  }), (0, _shared.isValid)(fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction9 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction9 === void 0 ? void 0 : _fieldSchema$xAction9['onSuccess']) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
+  }), (0, _shared.isValid)(fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction10 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction10 === void 0 ? void 0 : _fieldSchema$xAction10['onSuccess']) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
     title: {
       'customize:save': t('After successful save'),
       'customize:update': t('After successful update'),
@@ -304,7 +314,7 @@ var ActionDesigner = function ActionDesigner(props) {
       'customize:form:request': t('After successful request'),
       'customize:bulkUpdate': t('After successful bulk update')
     }[actionType],
-    initialValues: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction10 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction10 === void 0 ? void 0 : _fieldSchema$xAction10['onSuccess'],
+    initialValues: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xAction11 = fieldSchema['x-action-settings']) === null || _fieldSchema$xAction11 === void 0 ? void 0 : _fieldSchema$xAction11['onSuccess'],
     schema: {
       type: 'object',
       title: {

package/lib/schema-component/antd/action/Action.js

@@ -27,6 +27,8 @@ var _hooks = require("../../hooks");
 
 var _useProps2 = require("../../hooks/useProps");
 
+var _recordProvider = require("../../../record-provider");
+
 var _Action = _interopRequireDefault(require("./Action.Container"));
 
 var _Action2 = require("./Action.Designer");
@@ -43,7 +45,11 @@ var _context = require("./context");
 
 var _hooks2 = require("./hooks");
 
-var _excluded = ["popover", "confirm", "containerRefKey", "component", "useAction", "className", "icon", "title"];
+var _2 = require("../../");
+
+var _utils = require("./utils");
+
+var _excluded = ["popover", "confirm", "openMode", "containerRefKey", "component", "useAction", "className", "icon", "title"];
 
 var _templateObject, _templateObject2;
 
@@ -84,6 +90,7 @@ var Action = (0, _react.observer)(function (props) {
 
   var popover = props.popover,
       confirm = props.confirm,
+      om = props.openMode,
       containerRefKey = props.containerRefKey,
       component = props.component,
       _props$useAction = props.useAction,
@@ -115,13 +122,28 @@ var Action = (0, _react.observer)(function (props) {
   var fieldSchema = (0, _react.useFieldSchema)();
   var compile = (0, _hooks.useCompile)();
   var form = (0, _react.useForm)();
+  var values = (0, _recordProvider.useRecord)();
   var designerProps = fieldSchema['x-designer-props'];
   var openMode = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon['openMode'];
   var disabled = form.disabled || field.disabled;
   var openSize = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2['openSize'];
+  var linkageRules = (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-linkage-rules']) || [];
+
+  var _useDesignable = (0, _2.useDesignable)(),
+      designable = _useDesignable.designable;
+
+  (0, _react2.useEffect)(function () {
+    linkageRules.map(function (v) {
+      var _v$actions;
+
+      return (_v$actions = v.actions) === null || _v$actions === void 0 ? void 0 : _v$actions.map(function (h) {
+        (0, _utils.linkageAction)(h.operator, field, v.condition, values, designable);
+      });
+    });
+  }, [linkageRules]);
 
   var renderButton = function renderButton() {
-    var _field$data;
+    var _field$data, _field$data2;
 
     return /*#__PURE__*/_react2.default.createElement(_common.SortableItem, _objectSpread(_objectSpread({}, others), {}, {
       loading: field === null || field === void 0 ? void 0 : (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.loading,
@@ -129,6 +151,9 @@ var Action = (0, _react.observer)(function (props) {
         type: icon
       }),
       disabled: disabled,
+      style: {
+        border: (field === null || field === void 0 ? void 0 : (_field$data2 = field.data) === null || _field$data2 === void 0 ? void 0 : _field$data2.hidden) && '1px dashed #ede9e9'
+      },
       onClick: function onClick(e) {
         if (!disabled) {
           e.preventDefault();

package/lib/schema-component/antd/action/utils.d.ts

@@ -1,2 +1,3 @@
 import type { ISchema } from '@formily/react';
 export declare const requestSettingsSchema: ISchema;
+export declare const linkageAction: (operator: any, field: any, condition: any, values: any, designable: any) => any;

package/lib/schema-component/antd/action/utils.js

@@ -3,7 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.requestSettingsSchema = void 0;
+exports.requestSettingsSchema = exports.linkageAction = void 0;
+
+var _lodash = require("lodash");
+
+var _uitls = require("../../common/utils/uitls");
+
+var _type = require("../../../schema-settings/LinkageRules/type");
+
 var validateJSON = {
   validator: "{{(value, rule)=> {\n    if (!value) {\n      return '';\n    }\n    try {\n      const val = JSON.parse(value);\n      if(!isNaN(val)) {\n        return false;\n      }\n      return true;\n    } catch(error) {\n      console.error(error);\n      return false;\n    }\n  }}}",
   message: '{{t("Invalid JSON format")}}'
@@ -64,4 +71,53 @@ var requestSettingsSchema = {
     }
   }
 };
-exports.requestSettingsSchema = requestSettingsSchema;
+exports.requestSettingsSchema = requestSettingsSchema;
+
+var linkageAction = function linkageAction(operator, field, condition, values, designable) {
+  var displayResult = [field.display];
+  var disableResult = [field.disabled];
+
+  switch (operator) {
+    case _type.ActionType.Visible:
+      if ((0, _uitls.conditionAnalyse)(condition, values)) {
+        displayResult.push(operator);
+      }
+
+      field.display = (0, _lodash.last)(displayResult);
+      break;
+
+    case _type.ActionType.Hidden:
+      if ((0, _uitls.conditionAnalyse)(condition, values)) {
+        if (!designable) {
+          displayResult.push(operator);
+        } else {
+          field.data = field.data || {};
+          field.data.hidden = true;
+        }
+      }
+
+      field.display = (0, _lodash.last)(displayResult);
+      break;
+
+    case _type.ActionType.Disabled:
+      if ((0, _uitls.conditionAnalyse)(condition, values)) {
+        disableResult.push(true);
+      }
+
+      field.disabled = (0, _lodash.last)(disableResult);
+      break;
+
+    case _type.ActionType.Active:
+      if ((0, _uitls.conditionAnalyse)(condition, values)) {
+        disableResult.push(false);
+      }
+
+      field.disabled = (0, _lodash.last)(disableResult);
+      break;
+
+    default:
+      return null;
+  }
+};
+
+exports.linkageAction = linkageAction;

package/lib/schema-component/antd/association-filter/AssociationFilter.js

@@ -41,9 +41,9 @@ var AssociationFilter = function AssociationFilter(props) {
       exists = _useSchemaInitializer.exists,
       render = _useSchemaInitializer.render;
 
-  return /*#__PURE__*/_react2.default.createElement(_common.SortableItem, {
-    className: (0, _classnames.default)('nb-block-item', props.className, (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          position: relative;\n          &:hover {\n            > .general-schema-designer {\n              display: block;\n            }\n          }\n          &.nb-form-item:hover {\n            > .general-schema-designer {\n              background: rgba(241, 139, 98, 0.06) !important;\n              border: 0 !important;\n              top: -5px !important;\n              bottom: -5px !important;\n              left: -5px !important;\n              right: -5px !important;\n            }\n          }\n          > .general-schema-designer {\n            position: absolute;\n            z-index: 999;\n            top: 0;\n            bottom: 0;\n            left: 0;\n            right: 0;\n            display: none;\n            border: 2px solid rgba(241, 139, 98, 0.3);\n            pointer-events: none;\n            > .general-schema-designer-icons {\n              position: absolute;\n              right: 2px;\n              top: 2px;\n              line-height: 16px;\n              pointer-events: all;\n              .ant-space-item {\n                background-color: #f18b62;\n                color: #fff;\n                line-height: 16px;\n                width: 16px;\n                padding-left: 1px;\n              }\n            }\n          }\n        "]))))
-  }, /*#__PURE__*/_react2.default.createElement(Designer, null), props.children, render());
+  return /*#__PURE__*/_react2.default.createElement(_common.DndContext, null, /*#__PURE__*/_react2.default.createElement(_common.SortableItem, {
+    className: (0, _classnames.default)('nb-block-item', props.className, (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n            position: relative;\n            &:hover {\n              > .general-schema-designer {\n                display: block;\n              }\n            }\n            &.nb-form-item:hover {\n              > .general-schema-designer {\n                background: rgba(241, 139, 98, 0.06) !important;\n                border: 0 !important;\n                top: -5px !important;\n                bottom: -5px !important;\n                left: -5px !important;\n                right: -5px !important;\n              }\n            }\n            > .general-schema-designer {\n              position: absolute;\n              z-index: 999;\n              top: 0;\n              bottom: 0;\n              left: 0;\n              right: 0;\n              display: none;\n              border: 2px solid rgba(241, 139, 98, 0.3);\n              pointer-events: none;\n              > .general-schema-designer-icons {\n                position: absolute;\n                right: 2px;\n                top: 2px;\n                line-height: 16px;\n                pointer-events: all;\n                .ant-space-item {\n                  background-color: #f18b62;\n                  color: #fff;\n                  line-height: 16px;\n                  width: 16px;\n                  padding-left: 1px;\n                }\n              }\n            }\n          "]))))
+  }, /*#__PURE__*/_react2.default.createElement(Designer, null), props.children, render()));
 };
 
 exports.AssociationFilter = AssociationFilter;

package/lib/schema-component/antd/association-select/AssociationSelect.d.ts

@@ -4,9 +4,9 @@ export declare type AssociationSelectProps<P = any> = RemoteSelectProps<P> & {
     action?: string;
     multiple?: boolean;
 };
-interface RemoteSelectInterface {
+interface AssociationSelectInterface {
     (props: any): React.ReactElement;
     Designer: React.FC;
 }
-export declare const AssociationSelect: RemoteSelectInterface;
+export declare const AssociationSelect: AssociationSelectInterface;
 export default AssociationSelect;

package/lib/schema-component/antd/association-select/useServiceOptions.js

@@ -9,30 +9,73 @@ var _react = require("@formily/react");
 
 var _react2 = require("react");
 
+var _SharedFilterProvider = require("../../../block-provider/SharedFilterProvider");
+
 var _collectionManager = require("../../../collection-manager");
 
+var _recordProvider = require("../../../record-provider");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 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; }
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
 function useServiceOptions(props) {
   var _props$action = props.action,
       action = _props$action === void 0 ? 'list' : _props$action,
-      service = props.service;
+      service = props.service,
+      fieldNames = props.fieldNames;
+  var params = (service === null || service === void 0 ? void 0 : service.params) || {};
   var fieldSchema = (0, _react.useFieldSchema)();
 
   var _useCollection = (0, _collectionManager.useCollection)(),
       getField = _useCollection.getField;
 
+  var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
+      getCollectionFields = _useCollectionManager.getCollectionFields;
+
+  var record = (0, _recordProvider.useRecord)();
+  var normalizeValues = (0, _react2.useCallback)(function (obj) {
+    if (obj && _typeof(obj) === 'object') {
+      return obj[fieldNames.value];
+    }
+
+    return obj;
+  }, [fieldNames.value]);
+  var value = (0, _react2.useMemo)(function () {
+    if (props.value === undefined || props.value === null) {
+      return;
+    }
+
+    if (Array.isArray(props.value)) {
+      return props.value.map(normalizeValues);
+    } else {
+      return [normalizeValues(props.value)];
+    }
+  }, [props.value, normalizeValues]);
   var collectionField = (0, _react2.useMemo)(function () {
     return getField(fieldSchema.name);
   }, [fieldSchema.name]);
+  var sourceValue = record === null || record === void 0 ? void 0 : record[collectionField === null || collectionField === void 0 ? void 0 : collectionField.sourceKey];
+  var filter = (0, _react2.useMemo)(function () {
+    var isOToAny = ['oho', 'o2m'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface);
+    return (0, _SharedFilterProvider.mergeFilter)([(0, _SharedFilterProvider.mergeFilter)([isOToAny ? _defineProperty({}, collectionField.foreignKey, {
+      $is: null
+    }) : null, params === null || params === void 0 ? void 0 : params.filter]), isOToAny && sourceValue !== undefined && sourceValue !== null ? _defineProperty({}, collectionField.foreignKey, {
+      $eq: sourceValue
+    }) : null, (params === null || params === void 0 ? void 0 : params.filter) && value ? _defineProperty({}, fieldNames.value, _defineProperty({}, '$in', value)) : null], '$or');
+  }, [params === null || params === void 0 ? void 0 : params.filter, getCollectionFields, collectionField, sourceValue, value, fieldNames.value]);
   return (0, _react2.useMemo)(function () {
-    return _objectSpread({
+    return _objectSpread(_objectSpread({
       resource: collectionField === null || collectionField === void 0 ? void 0 : collectionField.target,
       action: action
-    }, service);
-  }, [collectionField === null || collectionField === void 0 ? void 0 : collectionField.target, action, service]);
+    }, service), {}, {
+      params: _objectSpread(_objectSpread({}, service === null || service === void 0 ? void 0 : service.params), {}, {
+        filter: filter
+      })
+    });
+  }, [collectionField === null || collectionField === void 0 ? void 0 : collectionField.target, action, filter, service]);
 }

package/lib/schema-component/antd/calendar/Calendar.Designer.js

@@ -31,38 +31,18 @@ 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 useOptions = function useOptions() {
-  var _fields$filter;
-
-  var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'string';
-  var compile = (0, _.useCompile)();
-
-  var _useCollection = (0, _collectionManager.useCollection)(),
-      fields = _useCollection.fields;
-
-  var options = fields === null || fields === void 0 ? void 0 : (_fields$filter = fields.filter(function (field) {
-    return field.type === type;
-  })) === null || _fields$filter === void 0 ? void 0 : _fields$filter.map(function (field) {
-    var _field$uiSchema;
-
-    return {
-      value: field.name,
-      label: compile(field === null || field === void 0 ? void 0 : (_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.title)
-    };
-  });
-  return options;
-};
-
 var CalendarDesigner = function CalendarDesigner() {
   var _fieldSchema$xDecora, _fieldSchema$xDecora$, _fieldSchema$xDecora2, _fieldSchema$xDecora3;
 
   var field = (0, _react.useField)();
   var fieldSchema = (0, _react.useFieldSchema)();
 
-  var _useCollection2 = (0, _collectionManager.useCollection)(),
-      name = _useCollection2.name,
-      title = _useCollection2.title,
-      fields = _useCollection2.fields;
+  var _useCollection = (0, _collectionManager.useCollection)(),
+      name = _useCollection.name,
+      title = _useCollection.title;
+
+  var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
+      getCollectionFieldsOptions = _useCollectionManager.getCollectionFieldsOptions;
 
   var dataSource = (0, _actionHooks.useCollectionFilterOptions)(name);
 
@@ -72,8 +52,6 @@ var CalendarDesigner = function CalendarDesigner() {
   var _useDesignable = (0, _.useDesignable)(),
       dn = _useDesignable.dn;
 
-  var compile = (0, _.useCompile)();
-
   var _useTranslation = (0, _reactI18next.useTranslation)(),
       t = _useTranslation.t;
 
@@ -87,7 +65,7 @@ var CalendarDesigner = function CalendarDesigner() {
   }, /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.BlockTitleItem, null), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
     title: t('Title field'),
     value: fieldNames.title,
-    options: useOptions('string'),
+    options: getCollectionFieldsOptions(name, 'string'),
     onChange: function onChange(title) {
       var _schema;
 
@@ -116,10 +94,12 @@ var CalendarDesigner = function CalendarDesigner() {
       });
       dn.refresh();
     }
-  }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
+  }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.CascaderItem, {
     title: t('Start date field'),
     value: fieldNames.start,
-    options: useOptions('date'),
+    options: getCollectionFieldsOptions(name, 'date', {
+      association: ['o2o', 'obo', 'oho', 'm2o']
+    }),
     onChange: function onChange(start) {
       var _schema3;
 
@@ -133,10 +113,12 @@ var CalendarDesigner = function CalendarDesigner() {
       });
       dn.refresh();
     }
-  }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
+  }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.CascaderItem, {
     title: t('End date field'),
     value: fieldNames.end,
-    options: useOptions('date'),
+    options: getCollectionFieldsOptions(name, 'date', {
+      association: ['o2o', 'obo', 'oho', 'm2o']
+    }),
     onChange: function onChange(end) {
       var _schema4;
 

package/lib/schema-component/antd/checkbox/Checkbox.js

@@ -36,17 +36,18 @@ var Checkbox = (0, _react.connect)(function (props) {
 }, (0, _react.mapProps)({
   value: 'checked',
   onInput: 'onChange'
-}, function (props, field) {
-  // console.log({ props, field });
-  return _objectSpread({}, props);
 }), (0, _react.mapReadPretty)(function (props) {
-  if (!(0, _shared.isValid)(props.value)) {
-    return null;
+  if (props.value) {
+    return /*#__PURE__*/_react2.default.createElement(_icons.CheckOutlined, {
+      style: {
+        color: '#52c41a'
+      }
+    });
   }
 
-  return props.value ? /*#__PURE__*/_react2.default.createElement(_icons.CheckOutlined, {
+  return props.showUnchecked ? /*#__PURE__*/_react2.default.createElement(_icons.CloseOutlined, {
     style: {
-      color: '#52c41a'
+      color: '#ff4d4f'
     }
   }) : null;
 }));

package/lib/schema-component/antd/date-picker/util.d.ts

@@ -5,4 +5,4 @@ export interface Moment2strOptions {
     picker?: 'year' | 'month' | 'week' | 'quarter';
 }
 export declare const moment2str: (value?: moment.Moment | moment.Moment[], options?: Moment2strOptions) => string | string[] | moment.Moment | moment.Moment[];
-export declare const mapDateFormat: () => (props: any) => any;
+export declare const mapDateFormat: () => (props: any, field: any) => any;

package/lib/schema-component/antd/date-picker/util.js

@@ -73,7 +73,7 @@ var moment2str = function moment2str(value) {
 exports.moment2str = moment2str;
 
 var mapDateFormat = function mapDateFormat() {
-  return function (props) {
+  return function (props, field) {
     var format = (0, _client.getDefaultFormat)(props);
     var _onChange = props.onChange;
     return _objectSpread(_objectSpread({}, props), {}, {

package/lib/schema-component/antd/filter/DynamicComponent.js

@@ -81,7 +81,8 @@ var VariableCascader = (0, _react.connect)(function (props) {
 
 var DynamicComponent = function DynamicComponent(props) {
   var _useContext = (0, _react2.useContext)(_context.FilterContext),
-      dynamicComponent = _useContext.dynamicComponent;
+      dynamicComponent = _useContext.dynamicComponent,
+      disabled = _useContext.disabled;
 
   var component = (0, _hooks.useComponent)(dynamicComponent);
   var form = (0, _react2.useMemo)(function () {
@@ -89,6 +90,7 @@ var DynamicComponent = function DynamicComponent(props) {
       values: {
         value: props.value
       },
+      disabled: disabled,
       effects: function effects() {
         (0, _core.onFieldValueChange)('value', function (field) {
           var _props$onChange;