@nocobase/client 0.12.0-alpha.2 → 0.12.0-alpha.4

package/es/schema-component/antd/association-field/hooks.js

@@ -1,18 +1,23 @@
 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 _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 _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-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); }
-import { useFieldSchema } from '@formily/react';
+import { useField, useFieldSchema, useForm } from '@formily/react';
+import flat from 'flat';
+import { isString } from 'lodash';
 import cloneDeep from 'lodash/cloneDeep';
 import { useCallback, useContext, useMemo } from 'react';
+import { useBlockRequestContext } from '../../../block-provider/BlockProvider';
 import { mergeFilter } from '../../../block-provider/SharedFilterProvider';
 import { useCollection, useCollectionManager } from '../../../collection-manager';
 import { isInFilterFormBlock } from '../../../filter-provider';
 import { useRecord } from '../../../record-provider';
+import { getInnermostKeyAndValue } from '../../common/utils/uitls';
 import { useDesignable } from '../../hooks';
 import { AssociationFieldContext } from './context';
+import { extractFilterfield, extractValuesByPattern, generatePattern, parseVariables } from './util';
 export var useInsertSchema = function useInsertSchema(component) {
   var fieldSchema = useFieldSchema();
   var _useDesignable = useDesignable(),
@@ -34,18 +39,85 @@ export function useAssociationFieldContext() {
   return useContext(AssociationFieldContext);
 }
 export default function useServiceOptions(props) {
+  var _ctx$props, _field$componentProps4, _field$componentProps5, _field$componentProps6, _service$params2;
   var _props$action = props.action,
     action = _props$action === void 0 ? 'list' : _props$action,
     service = props.service,
     fieldNames = props.fieldNames;
   var params = (service === null || service === void 0 ? void 0 : service.params) || {};
   var fieldSchema = useFieldSchema();
+  var field = useField();
+  var form = useForm();
+  var ctx = useBlockRequestContext();
   var _useCollection = useCollection(),
     getField = _useCollection.getField;
   var _useCollectionManager = useCollectionManager(),
     getCollectionFields = _useCollectionManager.getCollectionFields,
     getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
   var record = useRecord();
+  var parseFilter = useCallback(function (rules) {
+    if (!rules) {
+      return undefined;
+    }
+    if (typeof rules === 'string') {
+      return rules;
+    }
+    var type = Object.keys(rules)[0] || '$and';
+    var conditions = rules[type];
+    var results = [];
+    conditions === null || conditions === void 0 ? void 0 : conditions.forEach(function (c) {
+      var _jsonlogic$value, _jsonlogic$value$matc;
+      var jsonlogic = getInnermostKeyAndValue(c);
+      var regex = /{{(.*?)}}/;
+      var matches = (_jsonlogic$value = jsonlogic.value) === null || _jsonlogic$value === void 0 ? void 0 : (_jsonlogic$value$matc = _jsonlogic$value.match) === null || _jsonlogic$value$matc === void 0 ? void 0 : _jsonlogic$value$matc.call(_jsonlogic$value, regex);
+      if (!matches || !matches[1].includes('$form') && !matches[1].includes('$iteration')) {
+        results.push(c);
+        return;
+      }
+      var associationfield = extractFilterfield(matches[1]);
+      var filterCollectionField = getCollectionJoinField("".concat(ctx.props.collection, ".").concat(associationfield));
+      if (['o2m', 'm2m'].includes(filterCollectionField === null || filterCollectionField === void 0 ? void 0 : filterCollectionField.interface)) {
+        // 对多子表单
+        var pattern = generatePattern(matches === null || matches === void 0 ? void 0 : matches[1], associationfield);
+        var parseValue = extractValuesByPattern(flat(form.values), pattern);
+        var filters = parseValue.map(function (v) {
+          return JSON.parse(JSON.stringify(c).replace(jsonlogic.value, v));
+        });
+        results.push({
+          $or: filters
+        });
+      } else {
+        var variablesCtx = {
+          $form: form.values,
+          $iteration: form.values
+        };
+        var str = matches === null || matches === void 0 ? void 0 : matches[1];
+        if (str.includes('$iteration')) {
+          var path = field.path.segments.concat([]);
+          path.pop();
+          str = str.replace('$iteration.', "$iteration.".concat(path.join('.'), "."));
+        }
+        var _parseValue = parseVariables(str, variablesCtx);
+        if (Array.isArray(_parseValue)) {
+          var _filters = _parseValue.map(function (v) {
+            return JSON.parse(JSON.stringify(c).replace(jsonlogic.value, v));
+          });
+          results.push({
+            $or: _filters
+          });
+        } else {
+          var filterObj = JSON.parse(JSON.stringify(c).replace(jsonlogic.value, str.endsWith('id') ? _parseValue !== null && _parseValue !== void 0 ? _parseValue : 0 : _parseValue));
+          results.push(filterObj);
+        }
+      }
+    });
+    return _defineProperty({}, type, results);
+  }, [(_ctx$props = ctx.props) === null || _ctx$props === void 0 ? void 0 : _ctx$props.collection, field.path.segments, form.values, getCollectionJoinField]);
+  var fieldServiceFilter = useMemo(function () {
+    var _fieldSchema$xCompon, _fieldSchema$xCompon$, _fieldSchema$xCompon$2, _field$componentProps, _field$componentProps2, _field$componentProps3, _fieldSchema$xCompon2, _fieldSchema$xCompon3, _fieldSchema$xCompon4, _service$params;
+    var filterFromSchema = isString(fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : (_fieldSchema$xCompon$ = _fieldSchema$xCompon.service) === null || _fieldSchema$xCompon$ === void 0 ? void 0 : (_fieldSchema$xCompon$2 = _fieldSchema$xCompon$.params) === null || _fieldSchema$xCompon$2 === void 0 ? void 0 : _fieldSchema$xCompon$2.filter) ? (_field$componentProps = field.componentProps) === null || _field$componentProps === void 0 ? void 0 : (_field$componentProps2 = _field$componentProps.service) === null || _field$componentProps2 === void 0 ? void 0 : (_field$componentProps3 = _field$componentProps2.params) === null || _field$componentProps3 === void 0 ? void 0 : _field$componentProps3.filter : fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : (_fieldSchema$xCompon3 = _fieldSchema$xCompon2.service) === null || _fieldSchema$xCompon3 === void 0 ? void 0 : (_fieldSchema$xCompon4 = _fieldSchema$xCompon3.params) === null || _fieldSchema$xCompon4 === void 0 ? void 0 : _fieldSchema$xCompon4.filter;
+    return mergeFilter([parseFilter(filterFromSchema) || (service === null || service === void 0 ? void 0 : (_service$params = service.params) === null || _service$params === void 0 ? void 0 : _service$params.filter)]);
+  }, [(_field$componentProps4 = field.componentProps) === null || _field$componentProps4 === void 0 ? void 0 : (_field$componentProps5 = _field$componentProps4.service) === null || _field$componentProps5 === void 0 ? void 0 : (_field$componentProps6 = _field$componentProps5.params) === null || _field$componentProps6 === void 0 ? void 0 : _field$componentProps6.filter, fieldSchema, parseFilter, service === null || service === void 0 ? void 0 : (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2.filter]);
   var normalizeValues = useCallback(function (obj) {
     if (obj && _typeof(obj) === 'object') {
       return obj[fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value];
@@ -70,7 +142,7 @@ export default function useServiceOptions(props) {
     var isOToAny = ['oho', 'o2m'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface);
     return mergeFilter([mergeFilter([isOToAny && !isInFilterFormBlock(fieldSchema) && collectionField !== null && collectionField !== void 0 && collectionField.foreignKey ? _defineProperty({}, collectionField.foreignKey, {
       $is: null
-    }) : null, params === null || params === void 0 ? void 0 : params.filter]), isOToAny && sourceValue !== undefined && sourceValue !== null && !isInFilterFormBlock(fieldSchema) && collectionField !== null && collectionField !== void 0 && collectionField.foreignKey ? _defineProperty({}, collectionField.foreignKey, {
+    }) : null, fieldServiceFilter]), isOToAny && sourceValue !== undefined && sourceValue !== null && !isInFilterFormBlock(fieldSchema) && collectionField !== null && collectionField !== void 0 && collectionField.foreignKey ? _defineProperty({}, collectionField.foreignKey, {
       $eq: sourceValue
     }) : null, params !== null && params !== void 0 && params.filter && value ? _defineProperty({}, fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value, _defineProperty({}, '$in', value)) : null], '$or');
   }, [params === null || params === void 0 ? void 0 : params.filter, getCollectionFields, collectionField, sourceValue, value, fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value]);
@@ -86,9 +158,9 @@ export default function useServiceOptions(props) {
   }, [collectionField === null || collectionField === void 0 ? void 0 : collectionField.target, action, filter, service]);
 }
 export var useFieldNames = function useFieldNames(props) {
-  var _fieldSchema$xCompon, _fieldSchema$xCompon$, _fieldSchema$xCompon$2, _fieldSchema$xCompon$3, _fieldSchema$xCompon2;
+  var _fieldSchema$xCompon5, _fieldSchema$xCompon6, _fieldSchema$xCompon7, _fieldSchema$xCompon8, _fieldSchema$xCompon9;
   var fieldSchema = useFieldSchema();
-  var fieldNames = ((_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : (_fieldSchema$xCompon$ = _fieldSchema$xCompon['field']) === null || _fieldSchema$xCompon$ === void 0 ? void 0 : (_fieldSchema$xCompon$2 = _fieldSchema$xCompon$['uiSchema']) === null || _fieldSchema$xCompon$2 === void 0 ? void 0 : (_fieldSchema$xCompon$3 = _fieldSchema$xCompon$2['x-component-props']) === null || _fieldSchema$xCompon$3 === void 0 ? void 0 : _fieldSchema$xCompon$3['fieldNames']) || (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2['fieldNames']) || props.fieldNames;
+  var fieldNames = ((_fieldSchema$xCompon5 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon5 === void 0 ? void 0 : (_fieldSchema$xCompon6 = _fieldSchema$xCompon5['field']) === null || _fieldSchema$xCompon6 === void 0 ? void 0 : (_fieldSchema$xCompon7 = _fieldSchema$xCompon6['uiSchema']) === null || _fieldSchema$xCompon7 === void 0 ? void 0 : (_fieldSchema$xCompon8 = _fieldSchema$xCompon7['x-component-props']) === null || _fieldSchema$xCompon8 === void 0 ? void 0 : _fieldSchema$xCompon8['fieldNames']) || (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon9 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon9 === void 0 ? void 0 : _fieldSchema$xCompon9['fieldNames']) || props.fieldNames;
   return _objectSpread({
     label: 'label',
     value: 'value'

package/es/schema-component/antd/association-field/util.d.ts

@@ -6,3 +6,7 @@ export declare const getTabFormatValue: (labelUiSchema: ISchema, value: any, tag
 export declare function flatData(data: any): any[];
 export declare function isShowFilePicker(labelUiSchema: any): boolean;
 export declare const toValue: (value: any, placeholder: any) => any;
+export declare const parseVariables: (str: string, ctx: any) => any;
+export declare function extractFilterfield(str: any): any;
+export declare function extractValuesByPattern(obj: any, pattern: any): any[];
+export declare function generatePattern(str: any, fieldName: any): any;

package/es/schema-component/antd/association-field/util.js

@@ -13,6 +13,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import { isArr } from '@formily/shared';
 import { getDefaultFormat, str2moment } from '@nocobase/utils/client';
 import { Tag } from 'antd';
+import { get, isFunction } from 'lodash';
 import React from 'react';
 import { useCollectionManager } from '../../../collection-manager';
 export var useLabelUiSchema = function useLabelUiSchema(collectionName, label) {
@@ -107,4 +108,34 @@ export var toValue = function toValue(value, placeholder) {
     return placeholder;
   }
   return value;
-};
+};
+export var parseVariables = function parseVariables(str, ctx) {
+  if (str) {
+    var result = get(ctx, str);
+    return isFunction(result) ? result() : result;
+  } else {
+    return str;
+  }
+};
+export function extractFilterfield(str) {
+  var match = str.match(/^\$form\.([^.[\]]+)/);
+  if (match) {
+    return match[1];
+  }
+  return null;
+}
+export function extractValuesByPattern(obj, pattern) {
+  var regexPattern = new RegExp(pattern.replace(/\*/g, '\\d+'));
+  var result = [];
+  for (var key in obj) {
+    if (regexPattern.test(key)) {
+      var value = obj[key];
+      result.push(value);
+    }
+  }
+  return result;
+}
+export function generatePattern(str, fieldName) {
+  var result = str.replace("$form.".concat(fieldName, "."), "".concat(fieldName, ".*."));
+  return result;
+}

package/es/schema-component/antd/color-picker/ReadPretty.js

@@ -15,6 +15,6 @@ ReadPretty.ColorPicker = function ColorPicker(props) {
     showText: true,
     disabled: true,
     value: props.value,
-    size: 'small'
+    size: "small"
   }));
 };

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

@@ -14,7 +14,7 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 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 { css, cx } from '@emotion/css';
-import { ArrayCollapse, ArrayItems, FormLayout, FormItem as Item } from '@formily/antd-v5';
+import { ArrayCollapse, FormLayout, FormItem as Item } from '@formily/antd-v5';
 import { observer, useField, useFieldSchema } from '@formily/react';
 import { Select } from 'antd';
 import dayjs from 'dayjs';
@@ -24,7 +24,7 @@ import { useTranslation } from 'react-i18next';
 import { ACLCollectionFieldProvider } from '../../../acl/ACLProvider';
 import { useBlockRequestContext } from '../../../block-provider/BlockProvider';
 import { useFormBlockContext } from '../../../block-provider/FormBlockProvider';
-import { useCollection, useCollectionFilterOptions, useCollectionManager, useSortFields } from '../../../collection-manager';
+import { useCollection, useCollectionFilterOptions, useCollectionManager } from '../../../collection-manager';
 import { isTitleField } from '../../../collection-manager/Configuration/CollectionFields';
 import { GeneralSchemaItems } from '../../../schema-items/GeneralSchemaItems';
 import { GeneralSchemaDesigner, SchemaSettings, isPatternDisabled, isShowDefaultValue } from '../../../schema-settings';
@@ -58,6 +58,23 @@ export var findColumnFieldSchema = function findColumnFieldSchema(fieldSchema, g
   getAssociationAppends(fieldSchema);
   return _toConsumableArray(childsSchema);
 };
+function transformData(inputData) {
+  var transformedData = [];
+  var keys = Object.keys(inputData) || [];
+  var values = Object.values(inputData) || [];
+  var _loop = function _loop(i) {
+    var newObj = {};
+    keys.forEach(function (key, index) {
+      newObj[key] = values[index][i];
+    });
+    transformedData.push(newObj);
+  };
+  for (var i = 0; i < ((_values$ = values[0]) === null || _values$ === void 0 ? void 0 : _values$.length); i++) {
+    var _values$;
+    _loop(i);
+  }
+  return transformedData;
+}
 export var FormItem = observer(function (props) {
   var _schema$xDecoratorP, _schema$xDecoratorP2;
   useEnsureOperatorsValid();
@@ -89,24 +106,26 @@ export var FormItem = observer(function (props) {
           });
           iniValues = iniValues.concat(data);
         });
-        (_field$setInitialValu2 = field.setInitialValue) === null || _field$setInitialValu2 === void 0 ? void 0 : _field$setInitialValu2.call(field, _.uniqBy(iniValues, 'id'));
+        var data = _.uniqBy(iniValues, 'id');
+        (_field$setInitialValu2 = field.setInitialValue) === null || _field$setInitialValu2 === void 0 ? void 0 : _field$setInitialValu2.call(field, data.length > 0 ? data : [{}]);
       } else if ((collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) === 'o2m' && ['SubTable', 'Nester'].includes(schema === null || schema === void 0 ? void 0 : (_schema$xComponentP = schema['x-component-props']) === null || _schema$xComponentP === void 0 ? void 0 : _schema$xComponentP['mode']) // 间接对多
       ) {
         var childrenFieldWithDefault = findColumnFieldSchema(schema, getCollectionJoinField);
         // 子表格/子表单中找出所有belongsTo字段的上下文默认值
         if (childrenFieldWithDefault.length > 0) {
           var _field$setInitialValu3;
-          var _contextData = parseVariables('{{$context}}', variablesCtx);
-          var initValues = _contextData === null || _contextData === void 0 ? void 0 : _contextData.map(function (v) {
-            var obj = {};
-            childrenFieldWithDefault.forEach(function (s) {
-              var child = JSON.parse(s);
-              obj[child.name] = parseVariables(child.default, {
+          var tableData = parseVariables('{{$context}}', variablesCtx);
+          var _contextData = {};
+          // 将数据拍平
+          childrenFieldWithDefault === null || childrenFieldWithDefault === void 0 ? void 0 : childrenFieldWithDefault.forEach(function (s) {
+            var child = JSON.parse(s);
+            tableData === null || tableData === void 0 ? void 0 : tableData.map(function (v) {
+              _contextData[child.name] = _.uniqBy((_contextData[child.name] || []).concat(parseVariables(child.default, {
                 $context: v
-              });
+              })), 'id');
             });
-            return obj;
           });
+          var initValues = transformData(_contextData);
           (_field$setInitialValu3 = field.setInitialValue) === null || _field$setInitialValu3 === void 0 ? void 0 : _field$setInitialValu3.call(field, initValues);
         }
       }
@@ -128,7 +147,7 @@ export var FormItem = observer(function (props) {
   displayName: 'FormItem'
 });
 FormItem.Designer = function Designer() {
-  var _interfaceConfig$vali, _collectionField$uiSc, _getCollectionFields, _collectionField$targ, _fieldSchema$xCompon2, _fieldSchema$xCompon3, _fieldSchema$xCompon4, _field$componentProps, _field$componentProps2, _field$componentProps3, _field$componentProps4, _fieldSchema$xCompon5, _fieldSchema$xCompon6, _fieldSchema$xCompon7, _fieldSchema$xCompon8, _fieldSchema$xCompon9, _fieldSchema$xCompon10, _fieldSchema$xCompon11, _field$componentProps5, _fieldSchema$xCompon12, _fieldSchema$xCompon13, _fieldSchema$xCompon14, _field$componentProps6, _field$componentProps7, _field$componentProps8;
+  var _interfaceConfig$vali, _collectionField$uiSc, _getCollectionFields, _collectionField$targ, _fieldSchema$xCompon2, _fieldSchema$xCompon3, _fieldSchema$xCompon4, _field$componentProps, _fieldSchema$xCompon5, _fieldSchema$xCompon6, _fieldSchema$xCompon7, _fieldSchema$xCompon8, _fieldSchema$xCompon9, _fieldSchema$xCompon10, _fieldSchema$xCompon11, _field$componentProps2, _fieldSchema$xCompon12, _fieldSchema$xCompon13, _fieldSchema$xCompon14, _field$componentProps3, _field$componentProps4, _field$componentProps5;
   var targetField;
   var _useCollectionManager2 = useCollectionManager(),
     getCollectionFields = _useCollectionManager2.getCollectionFields,
@@ -189,19 +208,8 @@ FormItem.Designer = function Designer() {
   }
   var dataSource = useCollectionFilterOptions(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target);
   var defaultFilter = (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : (_fieldSchema$xCompon3 = _fieldSchema$xCompon2.service) === null || _fieldSchema$xCompon3 === void 0 ? void 0 : (_fieldSchema$xCompon4 = _fieldSchema$xCompon3.params) === null || _fieldSchema$xCompon4 === void 0 ? void 0 : _fieldSchema$xCompon4.filter) || {};
-  var sortFields = useSortFields(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target);
-  var defaultSort = ((_field$componentProps = field.componentProps) === null || _field$componentProps === void 0 ? void 0 : (_field$componentProps2 = _field$componentProps.service) === null || _field$componentProps2 === void 0 ? void 0 : (_field$componentProps3 = _field$componentProps2.params) === null || _field$componentProps3 === void 0 ? void 0 : _field$componentProps3.sort) || [];
-  var fieldMode = (field === null || field === void 0 ? void 0 : (_field$componentProps4 = field.componentProps) === null || _field$componentProps4 === void 0 ? void 0 : _field$componentProps4['mode']) || (isFileField ? 'FileManager' : 'Select');
+  var fieldMode = (field === null || field === void 0 ? void 0 : (_field$componentProps = field.componentProps) === null || _field$componentProps === void 0 ? void 0 : _field$componentProps['mode']) || (isFileField ? 'FileManager' : 'Select');
   var isSelectFieldMode = isAssociationField && fieldMode === 'Select';
-  var sort = defaultSort === null || defaultSort === void 0 ? void 0 : defaultSort.map(function (item) {
-    return item !== null && item !== void 0 && item.startsWith('-') ? {
-      field: item.substring(1),
-      direction: 'desc'
-    } : {
-      field: item,
-      direction: 'asc'
-    };
-  });
   var isSubFormMode = ((_fieldSchema$xCompon5 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon5 === void 0 ? void 0 : _fieldSchema$xCompon5.mode) === 'Nester';
   var isPickerMode = ((_fieldSchema$xCompon6 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon6 === void 0 ? void 0 : _fieldSchema$xCompon6.mode) === 'Picker';
   var showFieldMode = isAssociationField && fieldModeOptions && !isTableField;
@@ -405,91 +413,7 @@ FormItem.Designer = function Designer() {
         schema: (_schema4 = {}, _defineProperty(_schema4, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema4, 'x-component-props', field.componentProps), _schema4)
       });
     }
-  }), isSelectFieldMode && !field.readPretty && /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
-    title: t('Set default sorting rules'),
-    components: {
-      ArrayItems: ArrayItems
-    },
-    schema: {
-      type: 'object',
-      title: t('Set default sorting rules'),
-      properties: {
-        sort: {
-          type: 'array',
-          default: sort,
-          'x-component': 'ArrayItems',
-          'x-decorator': 'FormItem',
-          items: {
-            type: 'object',
-            properties: {
-              space: {
-                type: 'void',
-                'x-component': 'Space',
-                properties: {
-                  sort: {
-                    type: 'void',
-                    'x-decorator': 'FormItem',
-                    'x-component': 'ArrayItems.SortHandle'
-                  },
-                  field: {
-                    type: 'string',
-                    enum: sortFields,
-                    required: true,
-                    'x-decorator': 'FormItem',
-                    'x-component': 'Select',
-                    'x-component-props': {
-                      style: {
-                        width: 260
-                      }
-                    }
-                  },
-                  direction: {
-                    type: 'string',
-                    'x-decorator': 'FormItem',
-                    'x-component': 'Radio.Group',
-                    'x-component-props': {
-                      optionType: 'button'
-                    },
-                    enum: [{
-                      label: t('ASC'),
-                      value: 'asc'
-                    }, {
-                      label: t('DESC'),
-                      value: 'desc'
-                    }]
-                  },
-                  remove: {
-                    type: 'void',
-                    'x-decorator': 'FormItem',
-                    'x-component': 'ArrayItems.Remove'
-                  }
-                }
-              }
-            }
-          },
-          properties: {
-            add: {
-              type: 'void',
-              title: t('Add sort field'),
-              'x-component': 'ArrayItems.Addition'
-            }
-          }
-        }
-      }
-    },
-    onSubmit: function onSubmit(_ref2) {
-      var _schema5;
-      var sort = _ref2.sort;
-      var sortArr = sort.map(function (item) {
-        return item.direction === 'desc' ? "-".concat(item.field) : item.field;
-      });
-      _.set(field.componentProps, 'service.params.sort', sortArr);
-      fieldSchema['x-component-props'] = field.componentProps;
-      dn.emit('patch', {
-        schema: (_schema5 = {}, _defineProperty(_schema5, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema5, 'x-component-props', field.componentProps), _schema5)
-      });
-    }
-  }), showFieldMode && /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
+  }), isSelectFieldMode && !field.readPretty && /*#__PURE__*/React.createElement(SchemaSettings.SortingRule, null), showFieldMode && /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
     key: "field-mode",
     title: t('Field component'),
     options: fieldModeOptions,
@@ -588,7 +512,7 @@ FormItem.Designer = function Designer() {
       label: t('Pop-up'),
       value: 'modalAdd'
     }],
-    value: ((_field$componentProps5 = field.componentProps) === null || _field$componentProps5 === void 0 ? void 0 : _field$componentProps5.addMode) || 'none',
+    value: ((_field$componentProps2 = field.componentProps) === null || _field$componentProps2 === void 0 ? void 0 : _field$componentProps2.addMode) || 'none',
     onChange: function onChange(mode) {
       if (mode === 'modalAdd') {
         var hasAddNew = fieldSchema.reduceProperties(function (buf, schema) {
@@ -728,7 +652,7 @@ FormItem.Designer = function Designer() {
     key: "title-field",
     title: t('Title field'),
     options: options,
-    value: field === null || field === void 0 ? void 0 : (_field$componentProps6 = field.componentProps) === null || _field$componentProps6 === void 0 ? void 0 : (_field$componentProps7 = _field$componentProps6.fieldNames) === null || _field$componentProps7 === void 0 ? void 0 : _field$componentProps7.label,
+    value: field === null || field === void 0 ? void 0 : (_field$componentProps3 = field.componentProps) === null || _field$componentProps3 === void 0 ? void 0 : (_field$componentProps4 = _field$componentProps3.fieldNames) === null || _field$componentProps4 === void 0 ? void 0 : _field$componentProps4.label,
     onChange: function onChange(label) {
       var _collectionField$uiSc3, _collectionField$uiSc4;
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
@@ -750,7 +674,7 @@ FormItem.Designer = function Designer() {
     key: "title-field",
     title: t('Tag color field'),
     options: colorFieldOptions,
-    value: field === null || field === void 0 ? void 0 : (_field$componentProps8 = field.componentProps) === null || _field$componentProps8 === void 0 ? void 0 : _field$componentProps8.tagColorField,
+    value: field === null || field === void 0 ? void 0 : (_field$componentProps5 = field.componentProps) === null || _field$componentProps5 === void 0 ? void 0 : _field$componentProps5.tagColorField,
     onChange: function onChange(tagColorField) {
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
       fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};

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

@@ -113,6 +113,13 @@ export var Templates = function Templates(_ref) {
       }
     }
   }, []);
+  useEffect(function () {
+    if (!(templateOptions !== null && templateOptions !== void 0 && templateOptions.some(function (v) {
+      return v.key === targetTemplate;
+    }))) {
+      handleTemplateChange('none');
+    }
+  }, [templateOptions]);
   var wrapperStyle = useMemo(function () {
     return _objectSpread({
       display: 'flex',
@@ -130,7 +137,7 @@ export var Templates = function Templates(_ref) {
     };
   }, [token.fontSize, token.marginXS]);
   var handleTemplateChange = useCallback( /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(value, option) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(value) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -143,7 +150,7 @@ export var Templates = function Templates(_ref) {
         }
       }, _callee);
     }));
-    return function (_x2, _x3) {
+    return function (_x2) {
       return _ref2.apply(this, arguments);
     };
   }(), []);
@@ -178,7 +185,7 @@ export var Templates = function Templates(_ref) {
         }
       }, _callee2);
     }));
-    return function (_x4, _x5) {
+    return function (_x3, _x4) {
       return _ref3.apply(this, arguments);
     };
   }(), []);
@@ -203,7 +210,7 @@ export var Templates = function Templates(_ref) {
     },
     value: targetTemplate,
     onChange: handleTemplateChange
-  }), targetTemplate !== 'none' && /*#__PURE__*/React.createElement(RemoteSelect, {
+  }), targetTemplate !== 'none' && template && /*#__PURE__*/React.createElement(RemoteSelect, {
     style: {
       width: 220
     },
@@ -233,7 +240,7 @@ function findDataTemplates(fieldSchema) {
   }
   return {};
 }
-export function fetchTemplateData(_x6, _x7, _x8) {
+export function fetchTemplateData(_x5, _x6, _x7) {
   return _fetchTemplateData.apply(this, arguments);
 }
 function _fetchTemplateData() {

package/es/schema-component/antd/grid-card/GridCard.Item.js

@@ -4,15 +4,15 @@ import { css } from '@emotion/css';
 import { useField } from '@formily/react';
 import { Card } from 'antd';
 import React from 'react';
-import { RecordSimpleProvider } from '../../../record-provider';
+import { RecordProvider } from '../../../record-provider';
 var itemCss = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  width: 100%;\n  height: 100%;\n  flex-direction: column;\n  justify-content: space-between;\n  gap: 8px;\n"])));
 export var GridCardItem = function GridCardItem(props) {
   var field = useField();
   return /*#__PURE__*/React.createElement(Card, {
-    className: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n        height: 100%;\n        > .ant-card-body {\n          padding: 24px 24px 0px;\n          height: 100%;\n        }\n        .nb-action-bar button {\n          margin-bottom: 10px;\n        }\n      "])))
+    className: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n        height: 100%;\n        > .ant-card-body {\n          padding: 24px 24px 0px;\n          height: 100%;\n        }\n        .nb-action-bar {\n          padding: 5px 0;\n        }\n      "])))
   }, /*#__PURE__*/React.createElement("div", {
     className: itemCss
-  }, /*#__PURE__*/React.createElement(RecordSimpleProvider, {
-    value: field.value
+  }, /*#__PURE__*/React.createElement(RecordProvider, {
+    record: field.value
   }, props.children)));
 };

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

@@ -60,7 +60,8 @@ export var EllipsisWithTooltip = /*#__PURE__*/forwardRef(function (props, ref) {
     content: /*#__PURE__*/React.createElement("div", {
       style: {
         width: 300,
-        overflowX: 'auto'
+        overflow: 'auto',
+        maxHeight: 400
       }
     }, popoverContent || props.children)
   }, /*#__PURE__*/React.createElement("div", {

package/es/schema-component/antd/list/List.Item.js

@@ -1,11 +1,11 @@
 import { useField } from '@formily/react';
 import React from 'react';
-import { RecordSimpleProvider } from '../../../record-provider';
+import { RecordProvider } from '../../../record-provider';
 export var ListItem = function ListItem(props) {
   var field = useField();
   return /*#__PURE__*/React.createElement("div", {
     className: 'itemCss'
-  }, /*#__PURE__*/React.createElement(RecordSimpleProvider, {
-    value: field.value
+  }, /*#__PURE__*/React.createElement(RecordProvider, {
+    record: field.value
   }, props.children));
 };

package/es/schema-component/antd/markdown/Markdown.Void.js

@@ -18,6 +18,7 @@ import { Input as AntdInput, Button, Space, Spin } from 'antd';
 import cls from 'classnames';
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
+import { useGlobalTheme } from '../../../global-theme';
 import { useDesignable } from '../../hooks/useDesignable';
 import { MarkdownVoidDesigner } from './Markdown.Void.Designer';
 import { useStyles } from './style';
@@ -63,7 +64,11 @@ var MarkdownEditor = function MarkdownEditor(props) {
   }, t('Save'))));
 };
 export var MarkdownVoid = observer(function (props) {
-  var _useStyles = useStyles(),
+  var _useGlobalTheme = useGlobalTheme(),
+    isDarkTheme = _useGlobalTheme.isDarkTheme;
+  var _useStyles = useStyles({
+      isDarkTheme: isDarkTheme
+    }),
     componentCls = _useStyles.componentCls,
     hashId = _useStyles.hashId;
   var content = props.content,

package/es/schema-component/antd/markdown/Markdown.js

@@ -8,6 +8,7 @@ import { LoadingOutlined } from '@ant-design/icons';
 import { connect, mapProps, mapReadPretty } from '@formily/react';
 import { Input as AntdInput, Spin } from 'antd';
 import React from 'react';
+import { useGlobalTheme } from '../../../global-theme';
 import { ReadPretty as InputReadPretty } from '../input';
 import { MarkdownVoid } from './Markdown.Void';
 import { useStyles } from './style';
@@ -25,7 +26,11 @@ export var Markdown = connect(AntdInput.TextArea, mapProps(function (props, fiel
   return /*#__PURE__*/React.createElement(MarkdownReadPretty, _objectSpread({}, props));
 }));
 export var MarkdownReadPretty = function MarkdownReadPretty(props) {
-  var _useStyles = useStyles(),
+  var _useGlobalTheme = useGlobalTheme(),
+    isDarkTheme = _useGlobalTheme.isDarkTheme;
+  var _useStyles = useStyles({
+      isDarkTheme: isDarkTheme
+    }),
     wrapSSR = _useStyles.wrapSSR,
     hashId = _useStyles.hashId,
     className = _useStyles.componentCls;

package/es/schema-component/antd/markdown/style.js

@@ -5,12 +5,10 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { TinyColor } from '@ctrl/tinycolor';
-import { useGlobalTheme } from '../../../global-theme';
 import { genStyleHook } from './../__builtins__';
-export var useStyles = genStyleHook('nb-markdown', function (token) {
+export var useStyles = genStyleHook('nb-markdown', function (token, _ref) {
+  var isDarkTheme = _ref.isDarkTheme;
   var componentCls = token.componentCls;
-  var _useGlobalTheme = useGlobalTheme(),
-    isDarkTheme = _useGlobalTheme.isDarkTheme;
   var colorFillAlterSolid = new TinyColor(token.colorFillAlter).onBackground(token.colorBgContainer).toHexShortString();
   var defaultStyle = {
     // default style of markdown

package/es/schema-component/antd/quick-edit/QuickEdit.js

@@ -1,11 +1,11 @@
 var _templateObject;
-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 _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 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) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+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); }
 import { css } from '@emotion/css';
 import { FormItem } from '@formily/antd-v5';
 import { createForm } from '@formily/core';
@@ -14,20 +14,22 @@ import { Popover } from 'antd';
 import React, { useMemo, useRef } from 'react';
 import { useCollectionManager } from '../../../collection-manager';
 export var Editable = observer(function (props) {
+  var _field$value;
   var field = useField();
   var containerRef = useRef(null);
   var fieldSchema = useFieldSchema();
+  var value = _typeof(field.value) === 'object' ? (_field$value = field.value) === null || _field$value === void 0 ? void 0 : _field$value.default : field.value;
   var schema = {
     name: fieldSchema.name,
     'x-collection-field': fieldSchema['x-collection-field'],
     'x-component': 'CollectionField',
     'x-read-pretty': true,
-    default: field.value,
+    default: value,
     'x-component-props': fieldSchema['x-component-props']
   };
   var form = useMemo(function () {
     return createForm({
-      values: _defineProperty({}, fieldSchema.name, field.value)
+      values: _defineProperty({}, fieldSchema.name, value)
     });
   }, [field.value, fieldSchema['x-component-props']]);
   var getContainer = function getContainer() {