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

package/es/schema-component/antd/form-v2/utils.js

@@ -0,0 +1,161 @@
+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 _construct(Parent, args, Class) { if (_isNativeReflectConstruct()) { _construct = Reflect.construct; } else { _construct = function _construct(Parent, args, Class) { var a = [null]; a.push.apply(a, args); var Constructor = Function.bind.apply(Parent, a); var instance = new Constructor(); if (Class) _setPrototypeOf(instance, Class.prototype); return instance; }; } return _construct.apply(null, arguments); }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+import { last, get } from 'lodash';
+import * as functions from '@formulajs/formulajs';
+import { conditionAnalyse } from '../../common/utils/uitls';
+import { ActionType } from '../../../schema-settings/LinkageRules/type';
+
+function now() {
+  return new Date();
+}
+
+var fnNames = Object.keys(functions).filter(function (key) {
+  return key !== 'default';
+});
+var fns = fnNames.map(function (key) {
+  return functions[key];
+});
+
+function formula(expression) {
+  var scope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+  try {
+    var fn = _construct(Function, _toConsumableArray(fnNames).concat(_toConsumableArray(Object.keys(scope)), ["return ".concat(expression)]));
+
+    var result = fn.apply(void 0, _toConsumableArray(fns).concat(_toConsumableArray(Object.values(scope))));
+
+    if (typeof result === 'number') {
+      if (Number.isNaN(result) || !Number.isFinite(result)) {
+        return null;
+      }
+
+      return functions.ROUND(result, 9);
+    }
+
+    if (typeof result === 'function') {
+      return result();
+    }
+
+    return result;
+  } catch (error) {
+    return undefined;
+  }
+}
+
+export function evaluate(expression) {
+  var scope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+  var mergeScope = _objectSpread(_objectSpread({}, scope), {}, {
+    now: now
+  });
+
+  var exp = expression.trim().replace(/{{\s*([^{}]+)\s*}}/g, function (_, v) {
+    var item = get(scope, v);
+    var key = v.replace(/\.(\d+)/g, '["$1"]');
+    return " ".concat(typeof item === 'function' ? item() : key, " ");
+  });
+  return formula(exp, mergeScope);
+}
+export var linkageMergeAction = function linkageMergeAction(_ref, field, condition, values) {
+  var _field$linkagePropert, _field$initProperty, _field$linkagePropert2, _field$initProperty2, _field$linkagePropert3, _field$initProperty3, _field$linkagePropert4, _field$initProperty4, _field$linkagePropert5, _field$linkagePropert6, _field$linkagePropert7;
+
+  var operator = _ref.operator,
+      value = _ref.value;
+  var requiredResult = (field === null || field === void 0 ? void 0 : (_field$linkagePropert = field.linkageProperty) === null || _field$linkagePropert === void 0 ? void 0 : _field$linkagePropert.required) || [(field === null || field === void 0 ? void 0 : (_field$initProperty = field.initProperty) === null || _field$initProperty === void 0 ? void 0 : _field$initProperty.required) || false];
+  var displayResult = (field === null || field === void 0 ? void 0 : (_field$linkagePropert2 = field.linkageProperty) === null || _field$linkagePropert2 === void 0 ? void 0 : _field$linkagePropert2.display) || [field === null || field === void 0 ? void 0 : (_field$initProperty2 = field.initProperty) === null || _field$initProperty2 === void 0 ? void 0 : _field$initProperty2.display];
+  var patternResult = (field === null || field === void 0 ? void 0 : (_field$linkagePropert3 = field.linkageProperty) === null || _field$linkagePropert3 === void 0 ? void 0 : _field$linkagePropert3.pattern) || [field === null || field === void 0 ? void 0 : (_field$initProperty3 = field.initProperty) === null || _field$initProperty3 === void 0 ? void 0 : _field$initProperty3.pattern];
+  var valueResult = (field === null || field === void 0 ? void 0 : (_field$linkagePropert4 = field.linkageProperty) === null || _field$linkagePropert4 === void 0 ? void 0 : _field$linkagePropert4.value) || [field.value || (field === null || field === void 0 ? void 0 : (_field$initProperty4 = field.initProperty) === null || _field$initProperty4 === void 0 ? void 0 : _field$initProperty4.value)];
+
+  switch (operator) {
+    case ActionType.Required:
+      if (conditionAnalyse(condition, values)) {
+        requiredResult.push(true);
+      }
+
+      field.linkageProperty = _objectSpread(_objectSpread({}, field.linkageProperty), {}, {
+        required: requiredResult
+      });
+      field.required = last((_field$linkagePropert5 = field.linkageProperty) === null || _field$linkagePropert5 === void 0 ? void 0 : _field$linkagePropert5.required);
+      break;
+
+    case ActionType.InRequired:
+      if (conditionAnalyse(condition, values)) {
+        requiredResult.push(false);
+      }
+
+      field.linkageProperty = _objectSpread(_objectSpread({}, field.linkageProperty), {}, {
+        required: requiredResult
+      });
+      field.required = last((_field$linkagePropert6 = field.linkageProperty) === null || _field$linkagePropert6 === void 0 ? void 0 : _field$linkagePropert6.required);
+      break;
+
+    case ActionType.Visible:
+    case ActionType.None:
+    case ActionType.Hidden:
+      if (conditionAnalyse(condition, values)) {
+        displayResult.push(operator);
+      }
+
+      field.linkageProperty = _objectSpread(_objectSpread({}, field.linkageProperty), {}, {
+        display: displayResult
+      });
+      field.display = last((_field$linkagePropert7 = field.linkageProperty) === null || _field$linkagePropert7 === void 0 ? void 0 : _field$linkagePropert7.display);
+      break;
+
+    case ActionType.Editable:
+    case ActionType.ReadOnly:
+    case ActionType.ReadPretty:
+      if (conditionAnalyse(condition, values)) {
+        patternResult.push(operator);
+      }
+
+      field.linkageProperty = _objectSpread(_objectSpread({}, field.linkageProperty), {}, {
+        pattern: patternResult
+      });
+      field.pattern = last(field.linkageProperty.pattern);
+      break;
+
+    case ActionType.Value:
+      if (conditionAnalyse(condition, values)) {
+        if ((value === null || value === void 0 ? void 0 : value.mode) === 'express') {
+          var result = evaluate(value.result || value.value, values);
+          valueResult.push(result);
+        } else {
+          valueResult.push((value === null || value === void 0 ? void 0 : value.value) || value);
+        }
+      }
+
+      field.linkageProperty = _objectSpread(_objectSpread({}, field.linkageProperty), {}, {
+        value: valueResult
+      });
+      setTimeout(function () {
+        return field.value = last(valueResult) === undefined ? field.value : last(valueResult);
+      });
+      break;
+
+    default:
+      return null;
+  }
+};

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

@@ -68,8 +68,10 @@ export var G2PlotRenderer = /*#__PURE__*/forwardRef(function (props, ref) {
     if (plotRef.current) {
       plotRef.current.update(config);
     } else {
+      var _plotRef$current;
+
       plotRef.current = new plot(containerRef.current, config);
-      plotRef.current.render();
+      plotRef === null || plotRef === void 0 ? void 0 : (_plotRef$current = plotRef.current) === null || _plotRef$current === void 0 ? void 0 : _plotRef$current.render();
     }
 
     syncRef(plotRef, ref);

package/es/schema-component/antd/grid/Grid.js

@@ -394,15 +394,20 @@ Grid.Row = observer(function (props) {
   })));
 });
 Grid.Col = observer(function (props) {
-  var _schema$xComponentP;
-
   var _useContext = useContext(GridRowContext),
-      cols = _useContext.cols;
+      _useContext$cols = _useContext.cols,
+      cols = _useContext$cols === void 0 ? [] : _useContext$cols;
 
   var schema = useFieldSchema();
   var field = useField();
-  var w = (schema === null || schema === void 0 ? void 0 : (_schema$xComponentP = schema['x-component-props']) === null || _schema$xComponentP === void 0 ? void 0 : _schema$xComponentP['width']) || 100 / cols.length;
-  var width = "calc(".concat(w, "% - 24px - 24px / ").concat(cols.length, ")");
+  var width = '100%';
+
+  if (cols === null || cols === void 0 ? void 0 : cols.length) {
+    var _schema$xComponentP;
+
+    var w = (schema === null || schema === void 0 ? void 0 : (_schema$xComponentP = schema['x-component-props']) === null || _schema$xComponentP === void 0 ? void 0 : _schema$xComponentP['width']) || 100 / cols.length;
+    width = "calc(".concat(w, "% - 24px - 24px / ").concat(cols.length, ")");
+  }
 
   var _useDroppable3 = useDroppable({
     id: field.address.toString(),

package/es/schema-component/antd/icon-picker/IconPicker.js

@@ -67,6 +67,7 @@ function IconField(props) {
       }
     }, _toConsumableArray(icons.keys()).map(function (key) {
       return /*#__PURE__*/React.createElement("span", {
+        key: key,
         style: {
           fontSize: 18,
           marginRight: 10,

package/es/schema-component/antd/index.d.ts

@@ -36,4 +36,5 @@ export * from './tabs';
 export * from './time-picker';
 export * from './tree-select';
 export * from './upload';
+export * from './variable';
 import './index.less';

package/es/schema-component/antd/index.js

@@ -36,4 +36,5 @@ export * from './tabs';
 export * from './time-picker';
 export * from './tree-select';
 export * from './upload';
+export * from './variable';
 import './index.less';

package/es/schema-component/antd/input/Input.d.ts

@@ -1,9 +1,10 @@
 import { InputProps, TextAreaProps } from 'antd/lib/input';
 import React from 'react';
+import { JSONTextAreaProps } from './Json';
 declare type ComposedInput = React.FC<InputProps> & {
     TextArea?: React.FC<TextAreaProps>;
     URL?: React.FC<InputProps>;
-    JSON?: React.FC<TextAreaProps>;
+    JSON?: React.FC<JSONTextAreaProps>;
 };
 export declare const Input: ComposedInput;
 export default Input;

package/es/schema-component/antd/input/Json.d.ts

@@ -1,6 +1,8 @@
-/// <reference types="react" />
+import React, { Ref } from 'react';
 import { TextAreaProps } from 'antd/lib/input';
-export declare function Json({ value, onChange, space, ...props }: TextAreaProps & {
+export declare type JSONTextAreaProps = TextAreaProps & {
+    ref: Ref<any>;
     value: any;
     space: number;
-}): JSX.Element;
+};
+export declare const Json: React.ForwardRefExoticComponent<React.RefAttributes<React.Ref<any>>>;

package/es/schema-component/antd/input/Json.js

@@ -13,7 +13,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import React from 'react';
 import { useField } from '@formily/react';
 import { Input } from 'antd';
-export function Json(_ref) {
+export var Json = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var value = _ref.value,
       _onChange = _ref.onChange,
       _ref$space = _ref.space,
@@ -22,6 +22,7 @@ export function Json(_ref) {
 
   var field = useField();
   return /*#__PURE__*/React.createElement(Input.TextArea, _objectSpread(_objectSpread({}, props), {}, {
+    ref: ref,
     defaultValue: value != null ? JSON.stringify(value, null, space) : '',
     onChange: function onChange(ev) {
       try {
@@ -38,4 +39,4 @@ export function Json(_ref) {
       }
     }
   }));
-}
+});

package/es/schema-component/antd/input/ReadPretty.js

@@ -102,7 +102,7 @@ ReadPretty.JSON = function (props) {
 
   var prefixCls = usePrefixCls('json', props);
   return /*#__PURE__*/React.createElement("pre", {
-    className: cx(prefixCls, props.className, css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        margin-bottom: 0;\n      "])))),
+    className: cx(prefixCls, props.className, css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        margin-bottom: 0;\n        line-height: 1.5;\n        font-size: 90%;\n      "])))),
     style: props.style
   }, props.value != null ? JSON.stringify(props.value, null, (_props$space = props.space) !== null && _props$space !== void 0 ? _props$space : 2) : '');
 };

package/es/schema-component/antd/input-number/InputNumber.js

@@ -10,7 +10,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-import { connect, mapReadPretty } from '@formily/react';
+import { connect, mapReadPretty, useField } from '@formily/react';
 import { InputNumber as AntdNumber } from 'antd';
 import React from 'react';
 import { ReadPretty } from './ReadPretty';
@@ -18,6 +18,8 @@ export var InputNumber = connect(function (props) {
   var onChange = props.onChange,
       others = _objectWithoutProperties(props, _excluded);
 
+  var field = useField();
+
   var handleChange = function handleChange(v) {
     onChange(parseFloat(v));
   };

package/es/schema-component/antd/page/FixedBlock.js

@@ -89,13 +89,15 @@ export var useFixedBlockDesignerSetting = function useFixedBlockDesignerSetting(
 
   var record = useRecord();
   return useMemo(function () {
+    var _fieldSchema$xDecora3;
+
     if (Object.keys(record).length) {
       return;
     }
 
     return /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
       title: t('Fix block'),
-      checked: fieldSchema['x-decorator-props']['fixedBlock'],
+      checked: (_fieldSchema$xDecora3 = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora3 === void 0 ? void 0 : _fieldSchema$xDecora3.fixedBlock,
       onChange: function () {
         var _onChange = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(fixedBlock) {
           var _schema;

package/es/schema-component/antd/page/Page.js

@@ -30,6 +30,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
+import { PlusOutlined } from '@ant-design/icons';
 import { css } from '@emotion/css';
 import { FormDialog, FormLayout } from '@formily/antd';
 import { Schema, SchemaOptionsContext, useField, useFieldSchema } from '@formily/react';
@@ -40,6 +41,8 @@ import { useTranslation } from 'react-i18next';
 import { useHistory, useLocation } from 'react-router-dom';
 import { useDocumentTitle } from '../../../document-title';
 import { Icon } from '../../../icon';
+import { DndContext } from '../../common';
+import { SortableItem } from '../../common/sortable-item';
 import { SchemaComponent, SchemaComponentOptions } from '../../core';
 import { useCompile, useDesignable } from '../../hooks';
 import FixedBlock from './FixedBlock';
@@ -110,7 +113,7 @@ export var Page = function Page(props) {
     ghost: false,
     title: hidePageTitle ? undefined : fieldSchema.title || compile(title)
   }, others), {}, {
-    footer: enablePageTabs && /*#__PURE__*/React.createElement(Tabs, {
+    footer: enablePageTabs && /*#__PURE__*/React.createElement(DndContext, null, /*#__PURE__*/React.createElement(Tabs, {
       size: 'small',
       activeKey: activeKey,
       onTabClick: function onTabClick(activeKey) {
@@ -122,7 +125,8 @@ export var Page = function Page(props) {
         }, 50);
       },
       tabBarExtraContent: dn.designable && /*#__PURE__*/React.createElement(Button, {
-        className: css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n                          border-color: rgb(241, 139, 98) !important;\n                          color: rgb(241, 139, 98) !important;\n                        "]))),
+        icon: /*#__PURE__*/React.createElement(PlusOutlined, null),
+        className: css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n                            border-color: rgb(241, 139, 98) !important;\n                            color: rgb(241, 139, 98) !important;\n                          "]))),
         type: 'dashed',
         onClick: function () {
           var _onClick = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
@@ -185,10 +189,12 @@ export var Page = function Page(props) {
 
           return onClick;
         }()
-      }, "Add tab")
+      }, t('Add tab'))
     }, fieldSchema.mapProperties(function (schema) {
       return /*#__PURE__*/React.createElement(Tabs.TabPane, {
-        tab: /*#__PURE__*/React.createElement("span", {
+        tab: /*#__PURE__*/React.createElement(SortableItem, {
+          id: schema.name,
+          schema: schema,
           className: classNames('nb-action-link', designerCss, props.className)
         }, schema['x-icon'] && /*#__PURE__*/React.createElement(Icon, {
           style: {
@@ -200,7 +206,7 @@ export var Page = function Page(props) {
         })),
         key: schema.name
       });
-    }))
+    })))
   }))), /*#__PURE__*/React.createElement("div", {
     style: {
       margin: 24

package/es/schema-component/antd/page/PageTabDesigner.js

@@ -4,12 +4,12 @@ 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; }
 
-import { MenuOutlined } from '@ant-design/icons';
+import { DragOutlined, MenuOutlined } from '@ant-design/icons';
 import { useField, useFieldSchema } from '@formily/react';
 import { Modal, Space } from 'antd';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { useDesignable } from '../..';
+import { DragHandler, useDesignable } from '../..';
 import { SchemaSettings } from '../../../schema-settings';
 export var PageDesigner = function PageDesigner(_ref) {
   var _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon3, _fieldSchema$xCompon4, _fieldSchema$xCompon5;
@@ -137,7 +137,7 @@ export var PageTabDesigner = function PageTabDesigner(_ref3) {
   }, /*#__PURE__*/React.createElement(Space, {
     size: 2,
     align: 'center'
-  }, /*#__PURE__*/React.createElement(SchemaSettings, {
+  }, /*#__PURE__*/React.createElement(DragHandler, null, /*#__PURE__*/React.createElement(DragOutlined, null)), /*#__PURE__*/React.createElement(SchemaSettings, {
     title: /*#__PURE__*/React.createElement(MenuOutlined, {
       style: {
         cursor: 'pointer',

package/es/schema-component/antd/record-picker/ReadPrettyRecordPicker.js

@@ -32,6 +32,8 @@ var toValue = function toValue(value, placeholder) {
 };
 
 export var ReadPrettyRecordPicker = observer(function (props) {
+  var _collectionField$targ;
+
   var ellipsis = props.ellipsis;
   var fieldSchema = useFieldSchema();
   var recordCtx = useRecord();
@@ -123,7 +125,7 @@ export var ReadPrettyRecordPicker = observer(function (props) {
   return collectionField ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BlockAssociationContext.Provider, {
     value: "".concat(collectionField.collectionName, ".").concat(collectionField.name)
   }, /*#__PURE__*/React.createElement(CollectionProvider, {
-    name: collectionField.target
+    name: (_collectionField$targ = collectionField.target) !== null && _collectionField$targ !== void 0 ? _collectionField$targ : collectionField.targetCollection
   }, /*#__PURE__*/React.createElement(EllipsisWithTooltip, {
     ellipsis: ellipsis,
     ref: ellipsisWithTooltipRef

package/es/schema-component/antd/record-picker/RecordPicker.js

@@ -1,5 +1,4 @@
 import { connect, mapReadPretty } from '@formily/react';
 import { InputRecordPicker } from './InputRecordPicker';
 import { ReadPrettyRecordPicker } from './ReadPrettyRecordPicker';
-export var RecordPicker = connect(InputRecordPicker, // mapProps(mapSuffixProps),
-mapReadPretty(ReadPrettyRecordPicker));
+export var RecordPicker = connect(InputRecordPicker, mapReadPretty(ReadPrettyRecordPicker));

package/es/schema-component/antd/record-picker/util.js

@@ -25,6 +25,13 @@ export var getDatePickerLabels = function getDatePickerLabels(props) {
   return isArr(labels) ? labels.join('~') : labels;
 };
 export var getLabelFormatValue = function getLabelFormatValue(labelUiSchema, value) {
+  if (Array.isArray(labelUiSchema === null || labelUiSchema === void 0 ? void 0 : labelUiSchema.enum) && value) {
+    var opt = labelUiSchema.enum.find(function (option) {
+      return option.value === value;
+    });
+    return opt === null || opt === void 0 ? void 0 : opt.label;
+  }
+
   switch (labelUiSchema === null || labelUiSchema === void 0 ? void 0 : labelUiSchema['x-component']) {
     case 'DatePicker':
       return getDatePickerLabels(_objectSpread(_objectSpread({}, labelUiSchema === null || labelUiSchema === void 0 ? void 0 : labelUiSchema['x-component-props']), {}, {

package/es/schema-component/antd/remote-select/RemoteSelect.d.ts

@@ -7,6 +7,7 @@ export declare type RemoteSelectProps<P = any> = SelectProps<P, any> & {
     onChange?: (v: any) => void;
     target: string;
     wait?: number;
+    manual?: boolean;
     service: ResourceActionOptions<P>;
 };
 export declare const RemoteSelect: React.ForwardRefExoticComponent<Partial<SelectProps<any, any> & {
@@ -14,6 +15,7 @@ export declare const RemoteSelect: React.ForwardRefExoticComponent<Partial<Selec
     onChange?: (v: any) => void;
     target: string;
     wait?: number;
+    manual?: boolean;
     service: ResourceActionOptions<any>;
 }> & React.RefAttributes<unknown>> & {
     ReadPretty: typeof ReadPretty;

package/es/schema-component/antd/remote-select/RemoteSelect.js

@@ -1,21 +1,11 @@
-var _excluded = ["fieldNames", "service", "wait"];
+var _excluded = ["fieldNames", "service", "wait", "value", "objectValue", "manual"];
+
+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 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); }); }; }
 
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 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; }
@@ -28,13 +18,14 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 import { LoadingOutlined } from '@ant-design/icons';
 import { connect, mapProps, mapReadPretty } from '@formily/react';
-import React, { useMemo } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef } from 'react';
 import { useRequest } from '../../../api-client';
+import { mergeFilter } from '../../../block-provider/SharedFilterProvider';
 import { useCompile } from '../../hooks';
 import { defaultFieldNames, Select } from '../select';
 import { ReadPretty } from './ReadPretty';
 var InternalRemoteSelect = connect(function (props) {
-  var _service$params, _service$params2;
+  var _service$params;
 
   var _props$fieldNames = props.fieldNames,
       fieldNames = _props$fieldNames === void 0 ? {} : _props$fieldNames,
@@ -42,9 +33,14 @@ var InternalRemoteSelect = connect(function (props) {
       service = _props$service === void 0 ? {} : _props$service,
       _props$wait = props.wait,
       wait = _props$wait === void 0 ? 300 : _props$wait,
+      value = props.value,
+      objectValue = props.objectValue,
+      _props$manual = props.manual,
+      manual = _props$manual === void 0 ? true : _props$manual,
       others = _objectWithoutProperties(props, _excluded);
 
   var compile = useCompile();
+  var firstRun = useRef(false);
 
   var _useRequest = useRequest(_objectSpread(_objectSpread({
     action: 'list'
@@ -52,33 +48,43 @@ var InternalRemoteSelect = connect(function (props) {
     params: _objectSpread(_objectSpread({
       pageSize: 200
     }, service === null || service === void 0 ? void 0 : service.params), {}, {
-      fields: [fieldNames.label, fieldNames.value].concat(_toConsumableArray((service === null || service === void 0 ? void 0 : (_service$params = service.params) === null || _service$params === void 0 ? void 0 : _service$params.fields) || [])),
+      // fields: [fieldNames.label, fieldNames.value, ...(service?.params?.fields || [])],
       // search needs
-      filter: {
-        $and: [service === null || service === void 0 ? void 0 : (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2.filter].filter(Boolean)
-      }
+      filter: mergeFilter([service === null || service === void 0 ? void 0 : (_service$params = service.params) === null || _service$params === void 0 ? void 0 : _service$params.filter])
     })
   }), {
-    debounceWait: wait,
-    refreshDeps: [service, fieldNames.label, fieldNames.value]
+    manual: manual,
+    debounceWait: wait
   }),
       data = _useRequest.data,
-      run = _useRequest.run;
+      run = _useRequest.run,
+      loading = _useRequest.loading;
+
+  var runDep = useMemo(function () {
+    return JSON.stringify({
+      service: service,
+      fieldNames: fieldNames
+    });
+  }, [service, fieldNames]);
+  useEffect(function () {
+    // Lazy load
+    if (firstRun.current) {
+      run();
+    }
+  }, [runDep]);
 
   var onSearch = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(search) {
-      var _service$params3;
+      var _service$params2;
 
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               run({
-                filter: {
-                  $and: [_defineProperty({}, fieldNames.label, {
-                    $includes: search
-                  }), service === null || service === void 0 ? void 0 : (_service$params3 = service.params) === null || _service$params3 === void 0 ? void 0 : _service$params3.filter].filter(Boolean)
-                }
+                filter: mergeFilter([_defineProperty({}, fieldNames.label, {
+                  $includes: search
+                }), service === null || service === void 0 ? void 0 : (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2.filter])
               });
 
             case 1:
@@ -94,25 +100,61 @@ var InternalRemoteSelect = connect(function (props) {
     };
   }();
 
+  var getOptionsByFieldNames = useCallback(function (item) {
+    return Object.keys(fieldNames).reduce(function (obj, key) {
+      var value = item[fieldNames[key]];
+
+      if (value) {
+        // support hidden, disabled, etc.
+        obj[['label', 'value', 'options'].includes(key) ? fieldNames[key] : key] = key === 'label' ? compile(value) : value;
+      }
+
+      return obj;
+    }, {});
+  }, [fieldNames]);
+  var normalizeOptions = useCallback(function (obj) {
+    var _ref3;
+
+    if (objectValue || _typeof(obj) === 'object') {
+      return getOptionsByFieldNames(obj);
+    }
+
+    return _ref3 = {}, _defineProperty(_ref3, fieldNames.value, obj), _defineProperty(_ref3, fieldNames.label, obj), _ref3;
+  }, [objectValue, getOptionsByFieldNames]);
   var options = useMemo(function () {
-    var _data$data;
+    var _data$data, _data$data2;
+
+    if (!(data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data.length)) {
+      return value !== undefined && value !== null ? Array.isArray(value) ? value.map(normalizeOptions) : [normalizeOptions(value)] : [];
+    }
+
+    return (data === null || data === void 0 ? void 0 : (_data$data2 = data.data) === null || _data$data2 === void 0 ? void 0 : _data$data2.map(getOptionsByFieldNames)) || [];
+  }, [data === null || data === void 0 ? void 0 : data.data, getOptionsByFieldNames, normalizeOptions, value]);
+
+  var onDropdownVisibleChange = function onDropdownVisibleChange() {
+    if (firstRun.current) {
+      return;
+    }
+
+    run();
+    firstRun.current = true;
+  };
 
-    return (data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data.map(function (item) {
-      return _objectSpread(_objectSpread({}, item), {}, _defineProperty({}, fieldNames.label, compile(item[fieldNames.label])));
-    })) || [];
-  }, [data, fieldNames.label]);
   return /*#__PURE__*/React.createElement(Select, _objectSpread(_objectSpread({
     autoClearSearchValue: true,
     filterOption: false,
     filterSort: null,
     fieldNames: fieldNames,
-    onSearch: onSearch
+    onSearch: onSearch,
+    onDropdownVisibleChange: onDropdownVisibleChange,
+    objectValue: objectValue,
+    value: value
   }, others), {}, {
+    loading: loading,
     options: options
   }));
 }, mapProps({
-  dataSource: 'options',
-  loading: true
+  dataSource: 'options'
 }, function (props, field) {
   return _objectSpread(_objectSpread({}, props), {}, {
     fieldNames: _objectSpread(_objectSpread(_objectSpread({}, defaultFieldNames), props.fieldNames), field.componentProps.fieldNames),