@nocobase/client 0.7.1-alpha.6 → 0.7.2-alpha.2

package/lib/locale/zh_CN.js

@@ -126,6 +126,7 @@ var _default = {
   "Phone": "手机号码",
   "Email": "电子邮箱",
   "Number": "数字",
+  "Integer": "整数",
   "Percent": "百分比",
   "Password": "密码",
   "Formula": "公式",
@@ -179,7 +180,11 @@ var _default = {
   "Many to one description": "用于创建多对一关系，比如一个城市只能属于一个国家，一个国家可以有多个城市。作为字段存在时，它是一个下拉选择用于选择目标数据表的数据。创建后，会在目标数据表里自动生成一个多对一字段。",
   "Many to many description": "用于创建多对多关系，比如一个学生会有多个老师，一个老师也会有多个学生。作为字段存在时，它是一个下拉选择用于选择目标数据表的数据。",
   "Generated automatically if left blank": "留空时，自动生成中间表",
-  "References fields of associated table": "引用关联表的字段",
+  "Display association fields": "显示关联表的字段",
+  "Field component": "字段组件",
+  "Subtable": "子表格",
+  "Subform": "子表单",
+  "Record picker": "数据选择器",
   "Toggles the subfield mode": "切换子字段模式",
   "Selector mode": "选择器模式",
   "Subtable mode": "子表格模式",
@@ -195,6 +200,7 @@ var _default = {
   "Add filter group": "添加筛选分组",
   "is": "等于",
   "is not": "不等于",
+  "is variable": "为动态变量",
   "contains": "包含",
   "does not contain": "不包含",
   "starts with": "开头是",
@@ -507,10 +513,13 @@ var _default = {
   'Branch into "Yes" and "No"': '“是”和“否”分别继续',
   'Conditions': '条件配置',
   'Parallel branch': '分支',
+  'Add branch': '增加分支',
   'All succeeded': '全部成功',
   'Any succeeded': '任意成功',
+  'Any succeeded or failed': '任意成功或失败',
   'Continue after all branches succeeded': '全部分支都成功后才能继续',
   'Continue after any branch succeeded': '任意分支成功后就继续',
+  'Continue after any branch succeeded, or exit after any branch failed': '任意分支成功继续，或失败后退出',
   'Delay': '延时',
   'Duration': '时长',
   'End Status': '到时状态',

package/lib/schema-component/antd/AntdSchemaComponentProvider.js

@@ -17,6 +17,8 @@ var _SchemaComponentOptions = require("../core/SchemaComponentOptions");
 
 var _useFilterActionProps = require("./filter/useFilterActionProps");
 
+var _requestChartData = require("./g2plot/requestChartData");
+
 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); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -33,6 +35,7 @@ var AntdSchemaComponentProvider = function AntdSchemaComponentProvider(props) {
   var children = props.children;
   return /*#__PURE__*/_react.default.createElement(_SchemaComponentOptions.SchemaComponentOptions, {
     scope: {
+      requestChartData: _requestChartData.requestChartData,
       useFilterActionProps: _useFilterActionProps.useFilterActionProps
     },
     components: _objectSpread(_objectSpread({}, components), common)

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

@@ -7,12 +7,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.DynamicComponent = void 0;
 
+var _css = require("@emotion/css");
+
 var _core = require("@formily/core");
 
 var _react = require("@formily/react");
 
 var _shared = require("@formily/shared");
 
+var _antd = require("antd");
+
 var _react2 = _interopRequireWildcard(require("react"));
 
 var _core2 = require("../../core");
@@ -21,6 +25,10 @@ var _hooks = require("../../hooks");
 
 var _context = require("./context");
 
+var _useFilterActionProps = require("./useFilterActionProps");
+
+var _templateObject;
+
 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); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -31,6 +39,46 @@ 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; }
 
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+
+var VariableCascader = (0, _react.connect)(function (props) {
+  var fields = (0, _useFilterActionProps.useFilterOptions)('users');
+  var compile = (0, _hooks.useCompile)();
+  var value = props.value,
+      _onChange = props.onChange;
+  return /*#__PURE__*/_react2.default.createElement(_antd.Cascader, {
+    className: (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        width: 160px;\n      "]))),
+    value: value ? value.split('.') : [],
+    fieldNames: {
+      label: 'title',
+      value: 'name',
+      children: 'children'
+    },
+    onChange: function onChange(value) {
+      _onChange(value ? value.join('.') : null);
+    },
+    options: compile([{
+      title: '{{t("Current user")}}',
+      name: 'currentUser',
+      children: fields.filter(function (field) {
+        if (!field.target) {
+          return true;
+        }
+
+        return field.type === 'belongsTo';
+      }).map(function (field) {
+        if (field.children) {
+          field.children = field.children.filter(function (child) {
+            return !child.target;
+          });
+        }
+
+        return field;
+      })
+    }])
+  });
+});
+
 var DynamicComponent = function DynamicComponent(props) {
   var _useContext = (0, _react2.useContext)(_context.FilterContext),
       dynamicComponent = _useContext.dynamicComponent;
@@ -69,7 +117,10 @@ var DynamicComponent = function DynamicComponent(props) {
         'x-read-pretty': false,
         'x-validator': undefined,
         'x-decorator': undefined
-      })
+      }),
+      components: {
+        VariableCascader: VariableCascader
+      }
     }));
   };
 

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

@@ -9,6 +9,8 @@ exports.FilterItem = void 0;
 
 var _icons = require("@ant-design/icons");
 
+var _css = require("@emotion/css");
+
 var _react = require("@formily/react");
 
 var _antd = require("antd");
@@ -25,10 +27,14 @@ var _DynamicComponent = require("./DynamicComponent");
 
 var _useValues2 = require("./useValues");
 
+var _templateObject;
+
 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); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+
 var FilterItem = (0, _react.observer)(function (props) {
   var _useTranslation = (0, _reactI18next.useTranslation)(),
       t = _useTranslation.t;
@@ -52,6 +58,7 @@ var FilterItem = (0, _react.observer)(function (props) {
       marginBottom: 8
     }
   }, /*#__PURE__*/_react2.default.createElement(_antd.Space, null, /*#__PURE__*/_react2.default.createElement(_antd.Cascader, {
+    className: (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n            width: 160px;\n          "]))),
     fieldNames: {
       label: 'title',
       value: 'name',

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

@@ -70,6 +70,8 @@ var useFilterOptions = function useFilterOptions(collectionName) {
         operators = _fieldInterface$filte.operators;
     var option = {
       name: field.name,
+      type: field.type,
+      target: field.target,
       title: (field === null || field === void 0 ? void 0 : (_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.title) || field.name,
       schema: field === null || field === void 0 ? void 0 : field.uiSchema,
       operators: (operators === null || operators === void 0 ? void 0 : (_operators$filter = operators.filter) === null || _operators$filter === void 0 ? void 0 : _operators$filter.call(operators, function (operator) {

package/lib/schema-component/antd/form-item/FormItem.js

@@ -11,6 +11,8 @@ var _antd = require("@formily/antd");
 
 var _react = require("@formily/react");
 
+var _shared = require("@formily/shared");
+
 var _react2 = _interopRequireDefault(require("react"));
 
 var _reactI18next = require("react-i18next");
@@ -25,7 +27,7 @@ var _schemaSettings = require("../../../schema-settings");
 
 var _blockItem = require("../block-item");
 
-var _shared = require("../input/shared");
+var _shared2 = require("../input/shared");
 
 var _templateObject;
 
@@ -39,6 +41,14 @@ 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 divWrap = function divWrap(schema) {
+  return {
+    type: 'void',
+    'x-component': 'div',
+    properties: _defineProperty({}, schema.name || (0, _shared.uid)(), schema)
+  };
+};
+
 var FormItem = function FormItem(props) {
   var field = (0, _react.useField)();
   return /*#__PURE__*/_react2.default.createElement(_blockItem.BlockItem, {
@@ -48,7 +58,7 @@ var FormItem = function FormItem(props) {
   }, props), {}, {
     extra: field.description ? /*#__PURE__*/_react2.default.createElement("div", {
       dangerouslySetInnerHTML: {
-        __html: (0, _shared.HTMLEncode)(field.description).split('\n').join('<br/>')
+        __html: (0, _shared2.HTMLEncode)(field.description).split('\n').join('<br/>')
       }
     }) : null
   })));
@@ -56,15 +66,20 @@ var FormItem = function FormItem(props) {
 
 exports.FormItem = FormItem;
 
-FormItem.Designer = function () {
+FormItem.Designer = function (props) {
   var _collectionField$uiSc, _collectionField$uiSc2, _fieldSchema$xDecora, _field$componentProps, _field$componentProps2;
 
   var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
-      getCollectionFields = _useCollectionManager.getCollectionFields;
+      getCollectionFields = _useCollectionManager.getCollectionFields,
+      getCollection = _useCollectionManager.getCollection,
+      getInterface = _useCollectionManager.getInterface,
+      getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
 
   var _useCollection = (0, _collectionManager.useCollection)(),
       getField = _useCollection.getField;
 
+  var tk = (0, _blockProvider.useFilterByTk)();
+
   var _useFormBlockContext = (0, _blockProvider.useFormBlockContext)(),
       form = _useFormBlockContext.form;
 
@@ -76,12 +91,16 @@ FormItem.Designer = function () {
 
   var _useDesignable = (0, _.useDesignable)(),
       dn = _useDesignable.dn,
-      refresh = _useDesignable.refresh;
+      refresh = _useDesignable.refresh,
+      insertAdjacent = _useDesignable.insertAdjacent,
+      insertBeforeBegin = _useDesignable.insertBeforeBegin;
 
   var compile = (0, _.useCompile)();
-  var collectionField = getField(fieldSchema['name']);
+  var collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
+  var interfaceConfig = getInterface(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface);
   var originalTitle = collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc = collectionField.uiSchema) === null || _collectionField$uiSc === void 0 ? void 0 : _collectionField$uiSc.title;
   var targetFields = (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) ? getCollectionFields(collectionField.target) : [];
+  var isSubFormAssocitionField = field.address.segments.includes('__form_grid');
   var initialValue = {
     title: field.title === originalTitle ? undefined : field.title
   };
@@ -199,7 +218,7 @@ FormItem.Designer = function () {
       });
       dn.refresh();
     }
-  }), !field.readPretty && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
+  }), !field.readPretty && fieldSchema['x-component'] !== 'FormField' && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
     key: "required",
     title: t('Required'),
     checked: field.required,
@@ -214,6 +233,52 @@ FormItem.Designer = function () {
       });
       refresh();
     }
+  }), form && !isSubFormAssocitionField && ['o2o', 'oho', 'obo', 'o2m'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
+    title: t('Field component'),
+    options: (collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) === 'o2m' ? [{
+      label: t('Record picker'),
+      value: 'CollectionField'
+    }, {
+      label: t('Subtable'),
+      value: 'TableField'
+    }] : [{
+      label: t('Record picker'),
+      value: 'CollectionField'
+    }, {
+      label: t('Subform'),
+      value: 'FormField'
+    }],
+    value: fieldSchema['x-component'],
+    onChange: function onChange(v) {
+      var _interfaceConfig$sche;
+
+      var schema = {
+        name: collectionField.name,
+        type: 'void',
+        // title: compile(collectionField.uiSchema?.title),
+        'x-decorator': 'FormItem',
+        'x-designer': 'FormItem.Designer',
+        'x-component': v,
+        'x-component-props': {},
+        'x-collection-field': fieldSchema['x-collection-field']
+      };
+      interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche === void 0 ? void 0 : _interfaceConfig$sche.call(interfaceConfig, schema, {
+        field: collectionField,
+        block: 'Form',
+        readPretty: field.readPretty,
+        action: tk ? 'get' : null
+      });
+      insertAdjacent('beforeBegin', divWrap(schema), {
+        onSuccess: function onSuccess() {
+          dn.remove(null, {
+            removeParentsIfNoChildren: true,
+            breakRemoveOn: {
+              'x-component': 'Grid'
+            }
+          });
+        }
+      });
+    }
   }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && (collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) !== 'o2m' && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
     key: "pattern",
     title: t('Pattern'),
@@ -229,8 +294,6 @@ FormItem.Designer = function () {
     }],
     value: readOnlyMode,
     onChange: function onChange(v) {
-      console.log('v', v);
-
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
 
       switch (v) {
@@ -251,8 +314,7 @@ FormItem.Designer = function () {
             fieldSchema['x-disabled'] = false;
             schema['x-read-pretty'] = true;
             schema['x-disabled'] = false;
-            field.readPretty = true; // field.disabled = true;
-
+            field.readPretty = true;
             break;
           }
 
@@ -273,7 +335,7 @@ FormItem.Designer = function () {
       });
       dn.refresh();
     }
-  }), (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
+  }), (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) && fieldSchema['x-component'] === 'CollectionField' && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
     key: "title-field",
     title: t('Title field'),
     options: options,
@@ -283,14 +345,15 @@ FormItem.Designer = function () {
 
       var fieldNames = _objectSpread(_objectSpread({}, field.componentProps.fieldNames), {}, {
         label: label
-      });
+      }); // if (fieldSchema['x-component-props']?.['field']?.['uiSchema']?.['x-component-props']) {
+      //   fieldSchema['x-component-props']['field']['uiSchema']['x-component-props']['fieldNames'] = fieldNames;
+      // } else {
+      // }
+
 
       fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
       fieldSchema['x-component-props']['fieldNames'] = fieldNames;
-      field.componentProps.fieldNames = fieldNames;
-      schema['x-component-props'] = {
-        fieldNames: fieldNames
-      };
+      schema['x-component-props'] = fieldSchema['x-component-props'];
       dn.emit('patch', {
         schema: schema
       });

package/lib/schema-component/antd/form-v2/FormField.d.ts

@@ -0,0 +1 @@
+export declare const FormField: any;

package/lib/schema-component/antd/form-v2/FormField.js

@@ -0,0 +1,48 @@
+"use strict";
+
+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); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FormField = void 0;
+
+var _react = require("@formily/react");
+
+var _react2 = _interopRequireWildcard(require("react"));
+
+var _blockProvider = require("../../../block-provider");
+
+var _collectionManager = require("../../../collection-manager");
+
+var _hooks = require("../../hooks");
+
+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); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+var FormField = (0, _react.observer)(function (props) {
+  var fieldSchema = (0, _react.useFieldSchema)();
+
+  var _useCollection = (0, _collectionManager.useCollection)(),
+      getField = _useCollection.getField;
+
+  var field = (0, _react.useField)();
+  var collectionField = getField(fieldSchema.name);
+  var compile = (0, _hooks.useCompile)();
+  var ctx = (0, _blockProvider.useFormBlockContext)();
+  (0, _react2.useEffect)(function () {
+    if (!field.title) {
+      var _collectionField$uiSc;
+
+      field.title = compile(collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc = collectionField.uiSchema) === null || _collectionField$uiSc === void 0 ? void 0 : _collectionField$uiSc.title);
+    }
+
+    if (ctx === null || ctx === void 0 ? void 0 : ctx.field) {
+      ctx.field.added = ctx.field.added || new Set();
+      ctx.field.added.add(fieldSchema.name);
+    }
+  }, []);
+  return /*#__PURE__*/_react2.default.createElement("div", null, props.children);
+});
+exports.FormField = FormField;

package/lib/schema-component/antd/form-v2/index.d.ts

@@ -1,3 +1,4 @@
 import { Form as FormV2 } from './Form';
 import { DetailsDesigner } from './Form.Designer';
 export { FormV2, DetailsDesigner };
+export * from './FormField';

package/lib/schema-component/antd/form-v2/index.js

@@ -3,6 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _exportNames = {
+  FormV2: true,
+  DetailsDesigner: true
+};
 Object.defineProperty(exports, "DetailsDesigner", {
   enumerable: true,
   get: function get() {
@@ -20,5 +24,18 @@ var _Form = require("./Form");
 
 var _Form2 = require("./Form.Designer");
 
+var _FormField = require("./FormField");
+
+Object.keys(_FormField).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _FormField[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _FormField[key];
+    }
+  });
+});
 _Form.Form.Designer = _Form2.FormDesigner;
 _Form.Form.ReadPrettyDesigner = _Form2.ReadPrettyFormDesigner;

package/lib/schema-component/antd/g2plot/G2Plot.js

@@ -36,11 +36,41 @@ 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 plots = {
+  Line: _g2plot.Line,
   Area: _g2plot.Area,
   Column: _g2plot.Column,
-  Line: _g2plot.Line,
+  Bar: _g2plot.Bar,
   Pie: _g2plot.Pie,
-  Bar: _g2plot.Bar
+  Rose: _g2plot.Rose,
+  WordCloud: _g2plot.WordCloud,
+  Scatter: _g2plot.Scatter,
+  Radar: _g2plot.Radar,
+  DualAxes: _g2plot.DualAxes,
+  TinyLine: _g2plot.TinyLine,
+  TinyColumn: _g2plot.TinyColumn,
+  TinyArea: _g2plot.TinyArea,
+  Histogram: _g2plot.Histogram,
+  Progress: _g2plot.Progress,
+  RingProgress: _g2plot.RingProgress,
+  Heatmap: _g2plot.Heatmap,
+  Box: _g2plot.Box,
+  Violin: _g2plot.Violin,
+  Venn: _g2plot.Venn,
+  Stock: _g2plot.Stock,
+  Funnel: _g2plot.Funnel,
+  Liquid: _g2plot.Liquid,
+  Bullet: _g2plot.Bullet,
+  Sunburst: _g2plot.Sunburst,
+  Gauge: _g2plot.Gauge,
+  Waterfall: _g2plot.Waterfall,
+  RadialBar: _g2plot.RadialBar,
+  BidirectionalBar: _g2plot.BidirectionalBar,
+  Treemap: _g2plot.Treemap,
+  Sankey: _g2plot.Sankey,
+  Chord: _g2plot.Chord,
+  CirclePacking: _g2plot.CirclePacking,
+  Mix: _g2plot.Mix,
+  Facet: _g2plot.Facet
 };
 var G2PlotRenderer = /*#__PURE__*/(0, _react2.forwardRef)(function (props, ref) {
   var className = props.className,

package/lib/schema-component/antd/g2plot/requestChartData.d.ts

@@ -0,0 +1,4 @@
+import { APIClient } from '../../../api-client';
+export declare const requestChartData: (options: any) => (this: {
+    api: APIClient;
+}) => Promise<any>;

package/lib/schema-component/antd/g2plot/requestChartData.js

@@ -0,0 +1,42 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.requestChartData = void 0;
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+var requestChartData = function requestChartData(options) {
+  return /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+    var _response$data, response;
+
+    return regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            _context.next = 3;
+            return this.api.request(options);
+
+          case 3:
+            response = _context.sent;
+            return _context.abrupt("return", response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.data);
+
+          case 7:
+            _context.prev = 7;
+            _context.t0 = _context["catch"](0);
+            return _context.abrupt("return", []);
+
+          case 10:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, this, [[0, 7]]);
+  }));
+};
+
+exports.requestChartData = requestChartData;

package/lib/schema-component/antd/kanban/Kanban.Card.Designer.js

@@ -117,6 +117,15 @@ var KanbanCardDesigner = function KanbanCardDesigner(props) {
       type: 'itemGroup',
       title: t('Display fields'),
       children: fields
+    }, {
+      type: 'divider'
+    }, {
+      type: 'itemGroup',
+      title: t('Display association fields'),
+      children: (0, _utils.useAssociatedFormItemInitializerFields)({
+        readPretty: true,
+        block: 'Kanban'
+      })
     }],
     component: /*#__PURE__*/_react2.default.createElement(_icons.MenuOutlined, {
       style: {

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

@@ -138,19 +138,36 @@ var InputRecordPicker = function InputRecordPicker(props) {
   var fieldSchema = (0, _react.useFieldSchema)();
   var collectionField = useAssociation(props);
   var compile = (0, _hooks.useCompile)();
-  var options = (Array.isArray(value) ? value : value ? [value] : []).map(function (option) {
-    var label = option[fieldNames.label];
-    return _objectSpread(_objectSpread({}, option), {}, _defineProperty({}, fieldNames.label, compile(label)));
-  });
 
-  var _useState3 = (0, _react2.useState)(options),
+  var _useState3 = (0, _react2.useState)([]),
       _useState4 = _slicedToArray(_useState3, 2),
       selectedRows = _useState4[0],
       setSelectedRows = _useState4[1];
 
-  var values = options === null || options === void 0 ? void 0 : options.map(function (option) {
-    return option[fieldNames.value];
-  });
+  var _useState5 = (0, _react2.useState)([]),
+      _useState6 = _slicedToArray(_useState5, 2),
+      options = _useState6[0],
+      setOptions = _useState6[1];
+
+  (0, _react2.useEffect)(function () {
+    if (value) {
+      var opts = (Array.isArray(value) ? value : value ? [value] : []).map(function (option) {
+        var label = option[fieldNames.label];
+        return _objectSpread(_objectSpread({}, option), {}, _defineProperty({}, fieldNames.label, compile(label)));
+      });
+      setOptions(opts);
+      setSelectedRows(opts);
+    }
+  }, [value]);
+  (0, _react2.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) {
+      return v[fieldNames.value];
+    }) : [] : value === null || value === void 0 ? void 0 : value[fieldNames.value];
+  };
+
   return /*#__PURE__*/_react2.default.createElement("div", null, /*#__PURE__*/_react2.default.createElement(_antd.Select, _objectSpread(_objectSpread({}, others), {}, {
     mode: multiple ? 'multiple' : props.mode,
     fieldNames: fieldNames,
@@ -168,17 +185,17 @@ var InputRecordPicker = function InputRecordPicker(props) {
 
         setSelectedRows([]);
       } else if (Array.isArray(changed)) {
-        var _values = options === null || options === void 0 ? void 0 : options.filter(function (option) {
+        var values = options === null || options === void 0 ? void 0 : options.filter(function (option) {
           return changed.includes(option[fieldNames.value]);
         });
 
-        _onChange(_values);
+        _onChange(values);
 
-        setSelectedRows(_values);
+        setSelectedRows(values);
       }
     },
     options: options,
-    value: multiple ? values : values === null || values === void 0 ? void 0 : values[0],
+    value: getValue(),
     open: false
   })), /*#__PURE__*/_react2.default.createElement(RecordPickerContext.Provider, {
     value: {
@@ -203,7 +220,10 @@ var InputRecordPicker = function InputRecordPicker(props) {
     }
   }, /*#__PURE__*/_react2.default.createElement(_react.RecursionField, {
     schema: fieldSchema,
-    onlyRenderProperties: true
+    onlyRenderProperties: true,
+    filterProperties: function filterProperties(s) {
+      return s['x-component'] === 'RecordPicker.Selector';
+    }
   })))))));
 };